From 4d1525b0b825f1ea6376956f8c5d7667019931f4 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 14 Jun 2023 16:37:09 +0200 Subject: [PATCH] CMake: Remove the dysfunctional -testcocoon configure option TestCocoon is not maintained anymore, and the -testcocoon configure option of Qt didn't do anything useful since Qt 6.0.0. Remove the option. It's possible to create an instrumented build by using dedicated CMake toolchain files as described in the documentation of Squish Coco (TestCocoon's replacement). Fixes: QTBUG-88316 Change-Id: I8a565cdd288aca9208f48138d2b663802cc0de90 Reviewed-by: Alexey Edelev --- cmake/configure-cmake-mapping.md | 1 - config_help.txt | 1 - configure.cmake | 5 ----- qt_cmdline.cmake | 1 - 4 files changed, 8 deletions(-) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 27743cc4e8..e0f2492e17 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -46,7 +46,6 @@ The following table describes the mapping of configure options to CMake argument | -appstore-compliant | -DFEATURE_appstore_compliant=ON | | | -qtnamespace | -DQT_NAMESPACE= | | | -qtlibinfix | -DQT_LIBINFIX= | | -| -testcocoon | | | | -gcov | | | | -trace [backend] | -DINPUT_trace=yes or -DINPUT_trace= | | | | or -DFEATURE_ | | diff --git a/config_help.txt b/config_help.txt index 7be06c7f9f..68b9f58bcb 100644 --- a/config_help.txt +++ b/config_help.txt @@ -103,7 +103,6 @@ Build options: -qtnamespace .. Wrap all Qt library code in 'namespace {...}'. -qtlibinfix .. Rename all libQt6*.so to libQt6*.so. - -testcocoon .......... Instrument with the TestCocoon code coverage tool [no] -gcov ................ Instrument with the GCov code coverage tool [no] -trace [backend] ..... Enable instrumentation with tracepoints. diff --git a/configure.cmake b/configure.cmake index d334a9bbdd..361b37a331 100644 --- a/configure.cmake +++ b/configure.cmake @@ -568,11 +568,6 @@ qt_feature("largefile" ) qt_feature_definition("largefile" "QT_LARGEFILE_SUPPORT" VALUE "64") qt_feature_config("largefile" QMAKE_PRIVATE_CONFIG) -qt_feature("testcocoon" - LABEL "Testcocoon support" - AUTODETECT OFF -) -qt_feature_config("testcocoon" QMAKE_PUBLIC_CONFIG) qt_feature("sanitize_address" LABEL "Addresses" AUTODETECT OFF diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index be6ead7ce6..34b31ab991 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -112,7 +112,6 @@ qt_commandline_option(static-runtime TYPE boolean NAME static_runtime) qt_commandline_option(strip TYPE boolean) qt_commandline_option(syncqt TYPE boolean) qt_commandline_option(sysroot TYPE string) -qt_commandline_option(testcocoon TYPE boolean) qt_commandline_option(use-gold-linker TYPE boolean NAME use_gold_linker_alias) qt_commandline_option(warnings-are-errors TYPE boolean NAME warnings_are_errors) qt_commandline_option(Werror TYPE boolean NAME warnings_are_errors)