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/widgets/kernel/qaction/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt | 2 +- .../qapplication/desktopsettingsaware/.prev_CMakeLists.txt | 2 +- .../kernel/qapplication/desktopsettingsaware/CMakeLists.txt | 2 +- .../widgets/kernel/qapplication/modal/.prev_CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt | 2 +- .../auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt | 4 ++-- tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt | 4 ++-- tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qformlayout/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qlayout/CMakeLists.txt | 4 ++-- tests/auto/widgets/kernel/qshortcut/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qtooltip/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qwidget/CMakeLists.txt | 10 +++++----- tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt | 2 +- tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) (limited to 'tests/auto/widgets/kernel') diff --git a/tests/auto/widgets/kernel/qaction/CMakeLists.txt b/tests/auto/widgets/kernel/qaction/CMakeLists.txt index 5779f881df..dd70d5448f 100644 --- a/tests/auto/widgets/kernel/qaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qaction Test: ##################################################################### -qt_add_test(tst_qaction +qt_internal_add_test(tst_qaction SOURCES tst_qaction.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt index 1f9c93b1d0..927802103c 100644 --- a/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qactiongroup/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qactiongroup Test: ##################################################################### -qt_add_test(tst_qactiongroup +qt_internal_add_test(tst_qactiongroup SOURCES tst_qactiongroup.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt index 9692925831..8f04c7ff79 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## desktopsettingsaware Binary: ##################################################################### -qt_add_executable(desktopsettingsaware +qt_internal_add_executable(desktopsettingsaware SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt index 110c53d32f..a391d5b13d 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt @@ -4,7 +4,7 @@ ## desktopsettingsaware Binary: ##################################################################### -qt_add_executable(desktopsettingsaware_helper # special case +qt_internal_add_executable(desktopsettingsaware_helper # special case SOURCES main.cpp OUTPUT_DIRECTORY # special case diff --git a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt index fdd6547b41..24940d0589 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## modal Binary: ##################################################################### -qt_add_executable(modal +qt_internal_add_executable(modal SOURCES base.cpp base.h main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt index da00368540..95c429f936 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt @@ -4,7 +4,7 @@ ## modal Binary: ##################################################################### -qt_add_executable(modal_helper # special case +qt_internal_add_executable(modal_helper # special case SOURCES base.cpp base.h main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt index 114b8a286b..334a25bbac 100644 --- a/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/.prev_CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND test_data "../test/test.pro") list(APPEND test_data "../tmp/README") list(APPEND test_data "../modal") -qt_add_test(test +qt_internal_add_test(test SOURCES ../tst_qapplication.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ qt_add_test(test ## Scopes: ##################################################################### -qt_extend_target(test CONDITION builtin_testdata +qt_internal_extend_target(test CONDITION builtin_testdata DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt index f30b05d2d3..a93a677417 100644 --- a/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/test/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND test_data "../test/test.pro") list(APPEND test_data "../tmp/README") list(APPEND test_data "../modal") -qt_add_test(tst_qapplication # special case +qt_internal_add_test(tst_qapplication # special case SOURCES ../tst_qapplication.cpp PUBLIC_LIBRARIES @@ -25,7 +25,7 @@ qt_add_test(tst_qapplication # special case ## Scopes: ##################################################################### -qt_extend_target(tst_qapplication CONDITION builtin_testdata # special case +qt_internal_extend_target(tst_qapplication CONDITION builtin_testdata # special case DEFINES BUILTIN_TESTDATA ) diff --git a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt index a1986aa1a8..8fdc0d21a9 100644 --- a/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qboxlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qboxlayout Test: ##################################################################### -qt_add_test(tst_qboxlayout +qt_internal_add_test(tst_qboxlayout SOURCES tst_qboxlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt index 04124322e0..b084fe1634 100644 --- a/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qformlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qformlayout Test: ##################################################################### -qt_add_test(tst_qformlayout +qt_internal_add_test(tst_qformlayout SOURCES tst_qformlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt index 416a02ff19..9dfd6cb20c 100644 --- a/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgesturerecognizer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgesturerecognizer Test: ##################################################################### -qt_add_test(tst_qgesturerecognizer +qt_internal_add_test(tst_qgesturerecognizer SOURCES tst_qgesturerecognizer.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt index c70edfc4ac..c9ac563f01 100644 --- a/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qgridlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qgridlayout Test: ##################################################################### -qt_add_test(tst_qgridlayout +qt_internal_add_test(tst_qgridlayout SOURCES sortdialog.ui tst_qgridlayout.cpp diff --git a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt index 2acf0f1eb6..0ee2ce145e 100644 --- a/tests/auto/widgets/kernel/qlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qlayout/CMakeLists.txt @@ -10,7 +10,7 @@ file(GLOB_RECURSE test_data_glob baseline/*) list(APPEND test_data ${test_data_glob}) -qt_add_test(tst_qlayout +qt_internal_add_test(tst_qlayout SOURCES tst_qlayout.cpp PUBLIC_LIBRARIES @@ -30,7 +30,7 @@ if(ANDROID AND NOT ANDROID_EMBEDDED) "baseline/smartmaxsize" ) - qt_add_resource(tst_qlayout "testdata" + qt_internal_add_resource(tst_qlayout "testdata" PREFIX "/" FILES diff --git a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt index f2b3272588..06bd2d6ba8 100644 --- a/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qshortcut/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qshortcut Test: ##################################################################### -qt_add_test(tst_qshortcut +qt_internal_add_test(tst_qshortcut SOURCES tst_qshortcut.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt index 35ff76ab2c..36450d4f80 100644 --- a/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qsizepolicy/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qsizepolicy Test: ##################################################################### -qt_add_test(tst_qsizepolicy +qt_internal_add_test(tst_qsizepolicy SOURCES tst_qsizepolicy.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt index 470ad28bd1..2c1c3da277 100644 --- a/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qstackedlayout/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qstackedlayout Test: ##################################################################### -qt_add_test(tst_qstackedlayout +qt_internal_add_test(tst_qstackedlayout SOURCES tst_qstackedlayout.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt index 3a62e77490..a07cd1aa65 100644 --- a/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qtooltip/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qtooltip Test: ##################################################################### -qt_add_test(tst_qtooltip +qt_internal_add_test(tst_qtooltip SOURCES tst_qtooltip.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index d9ac38be84..d04db40e87 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidget Test: ##################################################################### -qt_add_test(tst_qwidget +qt_internal_add_test(tst_qwidget SOURCES tst_qwidget.cpp PUBLIC_LIBRARIES @@ -24,7 +24,7 @@ set(qwidget_resource_files "hellotr_la.qm" ) -qt_add_resource(tst_qwidget "qwidget" +qt_internal_add_resource(tst_qwidget "qwidget" PREFIX "/" FILES @@ -38,12 +38,12 @@ qt_add_resource(tst_qwidget "qwidget" ## Scopes: ##################################################################### -qt_extend_target(tst_qwidget CONDITION AIX +qt_internal_extend_target(tst_qwidget CONDITION AIX COMPILE_OPTIONS -fpermissive ) -qt_extend_target(tst_qwidget CONDITION APPLE +qt_internal_extend_target(tst_qwidget CONDITION APPLE SOURCES tst_qwidget_mac_helpers.mm PUBLIC_LIBRARIES @@ -51,7 +51,7 @@ qt_extend_target(tst_qwidget CONDITION APPLE ${FWSecurity} ) -qt_extend_target(tst_qwidget CONDITION WIN32 +qt_internal_extend_target(tst_qwidget CONDITION WIN32 PUBLIC_LIBRARIES gdi32 user32 diff --git a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt index d0349c7dcc..9bae267970 100644 --- a/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget_window/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidget_window Test: ##################################################################### -qt_add_test(tst_qwidget_window +qt_internal_add_test(tst_qwidget_window SOURCES tst_qwidget_window.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt index 0a559dcac6..58dae2d076 100644 --- a/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetaction/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetaction Test: ##################################################################### -qt_add_test(tst_qwidgetaction +qt_internal_add_test(tst_qwidgetaction SOURCES tst_qwidgetaction.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt index a4b8867389..3d8c3bbf4b 100644 --- a/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetmetatype/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetmetatype Test: ##################################################################### -qt_add_test(tst_qwidgetmetatype +qt_internal_add_test(tst_qwidgetmetatype SOURCES tst_qwidgetmetatype.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt index f4244f1a30..f387be7306 100644 --- a/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidgetsvariant/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwidgetsvariant Test: ##################################################################### -qt_add_test(tst_qwidgetsvariant +qt_internal_add_test(tst_qwidgetsvariant SOURCES tst_qwidgetsvariant.cpp INCLUDE_DIRECTORIES diff --git a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt index b173fae54f..63a3f9632d 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwindowcontainer/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qwindowcontainer Test: ##################################################################### -qt_add_test(tst_qwindowcontainer +qt_internal_add_test(tst_qwindowcontainer SOURCES tst_qwindowcontainer.cpp PUBLIC_LIBRARIES -- cgit v1.2.3