From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- tests/auto/corelib/global/q_func_info/CMakeLists.txt | 2 +- tests/auto/corelib/global/qflags/CMakeLists.txt | 2 +- tests/auto/corelib/global/qfloat16/CMakeLists.txt | 2 +- tests/auto/corelib/global/qgetputenv/CMakeLists.txt | 2 +- tests/auto/corelib/global/qglobal/CMakeLists.txt | 2 +- tests/auto/corelib/global/qglobalstatic/CMakeLists.txt | 2 +- tests/auto/corelib/global/qhooks/CMakeLists.txt | 2 +- tests/auto/corelib/global/qkeycombination/CMakeLists.txt | 2 +- tests/auto/corelib/global/qlogging/CMakeLists.txt | 4 ++-- tests/auto/corelib/global/qnumeric/CMakeLists.txt | 6 +++--- tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt | 2 +- tests/auto/corelib/global/qtendian/CMakeLists.txt | 2 +- tests/auto/corelib/global/qwinregistry/CMakeLists.txt | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tests/auto/corelib/global') diff --git a/tests/auto/corelib/global/q_func_info/CMakeLists.txt b/tests/auto/corelib/global/q_func_info/CMakeLists.txt index 57ae4369a2..93257c31de 100644 --- a/tests/auto/corelib/global/q_func_info/CMakeLists.txt +++ b/tests/auto/corelib/global/q_func_info/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_q_func_info Test: ##################################################################### -qt_add_test(tst_q_func_info +qt_internal_add_test(tst_q_func_info SOURCES tst_q_func_info.cpp ) diff --git a/tests/auto/corelib/global/qflags/CMakeLists.txt b/tests/auto/corelib/global/qflags/CMakeLists.txt index 8ba1cb6d48..998834d619 100644 --- a/tests/auto/corelib/global/qflags/CMakeLists.txt +++ b/tests/auto/corelib/global/qflags/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qflags Test: ##################################################################### -qt_add_test(tst_qflags +qt_internal_add_test(tst_qflags SOURCES tst_qflags.cpp ) diff --git a/tests/auto/corelib/global/qfloat16/CMakeLists.txt b/tests/auto/corelib/global/qfloat16/CMakeLists.txt index a9c3f2dd7f..b2848846fa 100644 --- a/tests/auto/corelib/global/qfloat16/CMakeLists.txt +++ b/tests/auto/corelib/global/qfloat16/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfloat16 Test: ##################################################################### -qt_add_test(tst_qfloat16 +qt_internal_add_test(tst_qfloat16 SOURCES tst_qfloat16.cpp ) diff --git a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt index a2cc20c378..79d45c58b0 100644 --- a/tests/auto/corelib/global/qgetputenv/CMakeLists.txt +++ b/tests/auto/corelib/global/qgetputenv/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgetputenv Test: ##################################################################### -qt_add_test(tst_qgetputenv +qt_internal_add_test(tst_qgetputenv SOURCES tst_qgetputenv.cpp ) diff --git a/tests/auto/corelib/global/qglobal/CMakeLists.txt b/tests/auto/corelib/global/qglobal/CMakeLists.txt index c292b65cf9..de9a94629a 100644 --- a/tests/auto/corelib/global/qglobal/CMakeLists.txt +++ b/tests/auto/corelib/global/qglobal/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qglobal Test: ##################################################################### -qt_add_test(tst_qglobal +qt_internal_add_test(tst_qglobal SOURCES qglobal.c tst_qglobal.cpp diff --git a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt index cadc627fa7..959b2b25b0 100644 --- a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt +++ b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qglobalstatic Test: ##################################################################### -qt_add_test(tst_qglobalstatic +qt_internal_add_test(tst_qglobalstatic EXCEPTIONS SOURCES tst_qglobalstatic.cpp diff --git a/tests/auto/corelib/global/qhooks/CMakeLists.txt b/tests/auto/corelib/global/qhooks/CMakeLists.txt index 0aaefaf96e..c8d6f1a769 100644 --- a/tests/auto/corelib/global/qhooks/CMakeLists.txt +++ b/tests/auto/corelib/global/qhooks/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhooks Test: ##################################################################### -qt_add_test(tst_qhooks +qt_internal_add_test(tst_qhooks SOURCES tst_qhooks.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qkeycombination/CMakeLists.txt b/tests/auto/corelib/global/qkeycombination/CMakeLists.txt index 894e1e973f..9553a35dea 100644 --- a/tests/auto/corelib/global/qkeycombination/CMakeLists.txt +++ b/tests/auto/corelib/global/qkeycombination/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qkeycombination Test: ##################################################################### -qt_add_test(tst_qkeycombination +qt_internal_add_test(tst_qkeycombination SOURCES tst_qkeycombination.cpp ) diff --git a/tests/auto/corelib/global/qlogging/CMakeLists.txt b/tests/auto/corelib/global/qlogging/CMakeLists.txt index e47f62776d..06f24a675f 100644 --- a/tests/auto/corelib/global/qlogging/CMakeLists.txt +++ b/tests/auto/corelib/global/qlogging/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from qlogging.pro. # This file is almost completely custom written # special case -qt_add_executable(qlogging_helper +qt_internal_add_executable(qlogging_helper NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES app/main.cpp @@ -16,7 +16,7 @@ endif() set_target_properties(qlogging_helper PROPERTIES CXX_VISIBILITY_PRESET default) # special case end -qt_add_test(tst_qlogging SOURCES tst_qlogging.cpp +qt_internal_add_test(tst_qlogging SOURCES tst_qlogging.cpp DEFINES QT_MESSAGELOGCONTEXT QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/corelib/global/qnumeric/CMakeLists.txt b/tests/auto/corelib/global/qnumeric/CMakeLists.txt index 7ca7b92f70..0359af03ae 100644 --- a/tests/auto/corelib/global/qnumeric/CMakeLists.txt +++ b/tests/auto/corelib/global/qnumeric/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qnumeric Test: ##################################################################### -qt_add_test(tst_qnumeric +qt_internal_add_test(tst_qnumeric SOURCES tst_qnumeric.cpp PUBLIC_LIBRARIES @@ -14,13 +14,13 @@ qt_add_test(tst_qnumeric ## Scopes: ##################################################################### -qt_extend_target(tst_qnumeric CONDITION ICC +qt_internal_extend_target(tst_qnumeric CONDITION ICC COMPILE_OPTIONS -fp-model strict ) -qt_extend_target(tst_qnumeric CONDITION intel_icl +qt_internal_extend_target(tst_qnumeric CONDITION intel_icl COMPILE_OPTIONS /fp:strict ) diff --git a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt index 4e162e8fa4..54fa36b5df 100644 --- a/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt +++ b/tests/auto/corelib/global/qrandomgenerator/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qrandomgenerator Test: ##################################################################### -qt_add_test(tst_qrandomgenerator +qt_internal_add_test(tst_qrandomgenerator SOURCES tst_qrandomgenerator.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qtendian/CMakeLists.txt b/tests/auto/corelib/global/qtendian/CMakeLists.txt index 77c3c433cd..acd0981991 100644 --- a/tests/auto/corelib/global/qtendian/CMakeLists.txt +++ b/tests/auto/corelib/global/qtendian/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtendian Test: ##################################################################### -qt_add_test(tst_qtendian +qt_internal_add_test(tst_qtendian SOURCES tst_qtendian.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt index fc88750c9c..95d591a125 100644 --- a/tests/auto/corelib/global/qwinregistry/CMakeLists.txt +++ b/tests/auto/corelib/global/qwinregistry/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwinregistry Test: ##################################################################### -qt_add_test(tst_qwinregistry +qt_internal_add_test(tst_qwinregistry SOURCES tst_qwinregistry.cpp PUBLIC_LIBRARIES -- cgit v1.2.3