diff options
| author | Alexandru Croitor <[email protected]> | 2020-02-12 12:59:24 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2020-02-12 17:30:34 +0000 |
| commit | 1d4fa26a706a97c0c76a7de5cf6c98bb345dfbd7 (patch) | |
| tree | 71e6a822db3536758c97e2df3bd5fb0ce40e3d1e | |
| parent | 3e0edc61cf4d2e0a613ed971f42a96120b094ecc (diff) | |
Regenerate qtdeclarative
Change-Id: I48d7fd306f3d1b161a8e73029282ee591b1ef612
Reviewed-by: Leander Beernaert <[email protected]>
Reviewed-by: Simon Hausmann <[email protected]>
Reviewed-by: Liang Qi <[email protected]>
253 files changed, 586 insertions, 1165 deletions
diff --git a/examples/quick/scenegraph/textureinthread/CMakeLists.txt b/examples/quick/scenegraph/textureinthread/CMakeLists.txt index 179f4fa5e4..d29a5c63f3 100644 --- a/examples/quick/scenegraph/textureinthread/CMakeLists.txt +++ b/examples/quick/scenegraph/textureinthread/CMakeLists.txt @@ -24,14 +24,11 @@ target_include_directories(textureinthread PUBLIC ../shared ) -target_link_libraries(textureinthread PRIVATE - Qt::CorePrivate - Qt::GuiPrivate -) - target_link_libraries(textureinthread PUBLIC Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Quick ) diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index 37d5970971..36f492b4a5 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -129,7 +129,7 @@ set_target_properties(QuickParticles PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQuick.Particles - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Particles" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Particles" ) qt6_qml_type_registration(QuickParticles) diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index a19926ab23..504d26e03d 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -613,7 +613,7 @@ set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) qt6_qml_type_registration(Qml) diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index 765b038acb..4d20ee1081 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -620,7 +620,7 @@ set_target_properties(Qml PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml" ) qt6_qml_type_registration(Qml) diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index 9fe275077b..a96f115ac2 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -72,7 +72,7 @@ set_target_properties(QmlModels PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml.Models - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/Models" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/Models" ) qt6_qml_type_registration(QmlModels) diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 0599001034..0b48e41a13 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -108,7 +108,7 @@ set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml.WorkerScript - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) qt6_qml_type_registration(QmlWorkerScript) diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index 6d3a87ab10..d5e83794e5 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -108,7 +108,7 @@ set_target_properties(QmlWorkerScript PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQml.WorkerScript - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQml/WorkerScript" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQml/WorkerScript" ) qt6_qml_type_registration(QmlWorkerScript) diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index c7c839fb49..aa08c89170 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -612,7 +612,7 @@ set_target_properties(Quick PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 2.15 QT_QML_MODULE_URI QtQuick - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick" ) qt6_qml_type_registration(Quick) diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index fae5b4dc88..641875e6d0 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -74,7 +74,7 @@ set_target_properties(QuickShapes PROPERTIES QT_QML_MODULE_INSTALL_QMLTYPES TRUE QT_QML_MODULE_VERSION 1.15 QT_QML_MODULE_URI QtQuick.Shapes - QT_QML_MODULE_INSTALL_DIR "${Qt6_DIR}/../../../qml/QtQuick/Shapes" + QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtQuick/Shapes" ) qt6_qml_type_registration(QuickShapes) diff --git a/tests/auto/particles/qquickage/CMakeLists.txt b/tests/auto/particles/qquickage/CMakeLists.txt index c808e2413f..e50a9a78e1 100644 --- a/tests/auto/particles/qquickage/CMakeLists.txt +++ b/tests/auto/particles/qquickage/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickage tst_qquickage.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickangleddirection/CMakeLists.txt b/tests/auto/particles/qquickangleddirection/CMakeLists.txt index 3219ed9a36..48aeb9e1ab 100644 --- a/tests/auto/particles/qquickangleddirection/CMakeLists.txt +++ b/tests/auto/particles/qquickangleddirection/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickangleddirection tst_qquickangleddirection.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt index 41b1e242cb..cce3fd96f4 100644 --- a/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt +++ b/tests/auto/particles/qquickcumulativedirection/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickcumulativedirection tst_qquickcumulativedirection.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt index dfd8617c64..cebe7f8664 100644 --- a/tests/auto/particles/qquickcustomaffector/CMakeLists.txt +++ b/tests/auto/particles/qquickcustomaffector/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickcustomaffector tst_qquickcustomaffector.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt index 6536b4f829..5dd5b4b7cb 100644 --- a/tests/auto/particles/qquickcustomparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickcustomparticle/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickcustomparticle tst_qquickcustomparticle.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt index fc4d50557b..396ca53047 100644 --- a/tests/auto/particles/qquickellipseextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickellipseextruder/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickellipseextruder tst_qquickellipseextruder.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickfriction/CMakeLists.txt b/tests/auto/particles/qquickfriction/CMakeLists.txt index 7a2ea204c5..5b2a46cc0d 100644 --- a/tests/auto/particles/qquickfriction/CMakeLists.txt +++ b/tests/auto/particles/qquickfriction/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickfriction tst_qquickfriction.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickgravity/CMakeLists.txt b/tests/auto/particles/qquickgravity/CMakeLists.txt index 4bb20de8c6..82fb41fc44 100644 --- a/tests/auto/particles/qquickgravity/CMakeLists.txt +++ b/tests/auto/particles/qquickgravity/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickgravity tst_qquickgravity.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt index 9f764f15c0..b72b7e617b 100644 --- a/tests/auto/particles/qquickgroupgoal/CMakeLists.txt +++ b/tests/auto/particles/qquickgroupgoal/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickgroupgoal tst_qquickgroupgoal.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickimageparticle/CMakeLists.txt b/tests/auto/particles/qquickimageparticle/CMakeLists.txt index f897651ef3..5f7864cd04 100644 --- a/tests/auto/particles/qquickimageparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickimageparticle/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickimageparticle tst_qquickimageparticle.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickitemparticle/CMakeLists.txt b/tests/auto/particles/qquickitemparticle/CMakeLists.txt index 0595f1506e..a896c13702 100644 --- a/tests/auto/particles/qquickitemparticle/CMakeLists.txt +++ b/tests/auto/particles/qquickitemparticle/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickitemparticle tst_qquickitemparticle.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquicklineextruder/CMakeLists.txt b/tests/auto/particles/qquicklineextruder/CMakeLists.txt index 614a175ed5..a845075438 100644 --- a/tests/auto/particles/qquicklineextruder/CMakeLists.txt +++ b/tests/auto/particles/qquicklineextruder/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquicklineextruder tst_qquicklineextruder.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt index bb96097806..1102f3a03f 100644 --- a/tests/auto/particles/qquickmaskextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickmaskextruder/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickmaskextruder tst_qquickmaskextruder.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt index 0ce6e17f5e..0e02d90d79 100644 --- a/tests/auto/particles/qquickparticlegroup/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlegroup/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickparticlegroup tst_qquickparticlegroup.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt index 10d42f8674..2a6c50f08d 100644 --- a/tests/auto/particles/qquickparticlesystem/CMakeLists.txt +++ b/tests/auto/particles/qquickparticlesystem/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickparticlesystem tst_qquickparticlesystem.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickpointattractor/CMakeLists.txt b/tests/auto/particles/qquickpointattractor/CMakeLists.txt index 6590136bd7..2fe3a17596 100644 --- a/tests/auto/particles/qquickpointattractor/CMakeLists.txt +++ b/tests/auto/particles/qquickpointattractor/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickpointattractor tst_qquickpointattractor.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickpointdirection/CMakeLists.txt b/tests/auto/particles/qquickpointdirection/CMakeLists.txt index f12c22d721..bda38034e0 100644 --- a/tests/auto/particles/qquickpointdirection/CMakeLists.txt +++ b/tests/auto/particles/qquickpointdirection/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickpointdirection tst_qquickpointdirection.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt index 9cfa12c01e..a285540410 100644 --- a/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt +++ b/tests/auto/particles/qquickrectangleextruder/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickrectangleextruder tst_qquickrectangleextruder.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickspritegoal/CMakeLists.txt b/tests/auto/particles/qquickspritegoal/CMakeLists.txt index ea9776111e..95be9dad08 100644 --- a/tests/auto/particles/qquickspritegoal/CMakeLists.txt +++ b/tests/auto/particles/qquickspritegoal/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickspritegoal tst_qquickspritegoal.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt index a98bd886be..0b95e975d2 100644 --- a/tests/auto/particles/qquicktargetdirection/CMakeLists.txt +++ b/tests/auto/particles/qquicktargetdirection/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquicktargetdirection tst_qquicktargetdirection.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt index c117228445..ac9f4c8423 100644 --- a/tests/auto/particles/qquicktrailemitter/CMakeLists.txt +++ b/tests/auto/particles/qquicktrailemitter/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquicktrailemitter tst_qquicktrailemitter.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickturbulence/CMakeLists.txt b/tests/auto/particles/qquickturbulence/CMakeLists.txt index 72e6e3b621..c98be1e304 100644 --- a/tests/auto/particles/qquickturbulence/CMakeLists.txt +++ b/tests/auto/particles/qquickturbulence/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickturbulence tst_qquickturbulence.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/particles/qquickwander/CMakeLists.txt b/tests/auto/particles/qquickwander/CMakeLists.txt index a747ae7227..c4e44cb7f1 100644 --- a/tests/auto/particles/qquickwander/CMakeLists.txt +++ b/tests/auto/particles/qquickwander/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qquickwander tst_qquickwander.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickParticlesPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles TESTDATA ${test_data} ) diff --git a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt index f6b8b2aa69..638540fab3 100644 --- a/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qabstractanimationjob/CMakeLists.txt @@ -7,11 +7,9 @@ qt_add_test(tst_qabstractanimationjob SOURCES tst_qabstractanimationjob.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt index d62512b489..54c1abb691 100644 --- a/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qanimationgroupjob/CMakeLists.txt @@ -7,11 +7,9 @@ qt_add_test(tst_qanimationgroupjob SOURCES tst_qanimationgroupjob.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt index 02fa824cd2..ba64d8cf0e 100644 --- a/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qparallelanimationgroupjob/CMakeLists.txt @@ -7,13 +7,11 @@ qt_add_test(tst_qparallelanimationgroupjob SOURCES tst_qparallelanimationgroupjob.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt index e337d8aea9..a1d07be77c 100644 --- a/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qpauseanimationjob/CMakeLists.txt @@ -7,13 +7,10 @@ qt_add_test(tst_qpauseanimationjob SOURCES tst_qpauseanimationjob.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt index 925f0c618b..b675121510 100644 --- a/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt +++ b/tests/auto/qml/animation/qsequentialanimationgroupjob/CMakeLists.txt @@ -7,11 +7,9 @@ qt_add_test(tst_qsequentialanimationgroupjob SOURCES tst_qsequentialanimationgroupjob.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt index 3f44aa3c0e..1aa7378875 100644 --- a/tests/auto/qml/bindingdependencyapi/CMakeLists.txt +++ b/tests/auto/qml/bindingdependencyapi/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_bindingdependencyapi tst_bindingdependencyapi.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt index 1a28e73cea..b75f143faa 100644 --- a/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qdebugmessageservice/CMakeLists.txt @@ -19,14 +19,12 @@ qt_add_test(tst_qdebugmessageservice INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlDebugPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::QmlDebug + Qt::QmlDebugPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt index 89e7b098bd..4650f9074d 100644 --- a/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt +++ b/tests/auto/qml/debugger/qpacketprotocol/CMakeLists.txt @@ -13,14 +13,12 @@ qt_add_test(tst_qpacketprotocol INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlDebugPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::QmlDebug + Qt::QmlDebugPrivate ) ## Scopes: diff --git a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt index 578bc9bd21..e727640a9d 100644 --- a/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugclient/CMakeLists.txt @@ -17,15 +17,12 @@ qt_add_test(tst_qqmldebugclient INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlDebugPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlDebug ) ## Scopes: diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt index c90cc0e9de..fbbaa3a0f4 100644 --- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/CMakeLists.txt @@ -13,14 +13,12 @@ qt_add_test(tst_qqmldebuggingenabler INCLUDE_DIRECTORIES ../../../../shared ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlDebugPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml - Qt::QmlDebug + Qt::QmlDebugPrivate ) #### Keys ignored in scope 1:.:.:qqmldebuggingenabler.pro:<TRUE>: diff --git a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt index 4f9777eeba..ba2f013b05 100644 --- a/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugjs/CMakeLists.txt @@ -19,13 +19,11 @@ qt_add_test(tst_qqmldebugjs INCLUDE_DIRECTORIES ../../../shared ../shared ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlDebugPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::QmlDebug TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt index 791ea18adb..7712af32db 100644 --- a/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebuglocal/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qqmldebuglocal INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlDebugPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlDebug ) ## Scopes: diff --git a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt index 9b369053cc..c4dcf92313 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmldebugservice/CMakeLists.txt @@ -22,15 +22,12 @@ qt_add_test(tst_qqmldebugservice INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlDebugPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlDebug TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt index a0f76b270a..177215080b 100644 --- a/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginecontrol/CMakeLists.txt @@ -19,13 +19,11 @@ qt_add_test(tst_qqmlenginecontrol INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlDebugPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::QmlDebug TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt index b8c377a268..9b81b04568 100644 --- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/CMakeLists.txt @@ -19,13 +19,11 @@ qt_add_test(tst_qqmlenginedebuginspectorintegration INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlDebugPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::QmlDebug TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt index 6e54b5c7f5..758d63c6e9 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/CMakeLists.txt @@ -15,13 +15,10 @@ qt_add_test(tst_qqmlenginedebugservice INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES - Qt::QmlDebugPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Qml - Qt::QmlDebug + Qt::QmlDebugPrivate + Qt::QmlPrivate Qt::Quick ) diff --git a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt index 822f59a2cb..5b5dc7cd52 100644 --- a/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlinspector/CMakeLists.txt @@ -19,13 +19,11 @@ qt_add_test(tst_qqmlinspector INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlDebugPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::QmlDebug TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt index c818c158dc..bbff6a73c5 100644 --- a/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlnativeconnector/CMakeLists.txt @@ -9,11 +9,10 @@ qt_add_test(tst_qqmlnativeconnector tst_qqmlnativeconnector.cpp DEFINES QT_QML_DEBUG - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml ) diff --git a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt index 1d31348b6d..32013a9c32 100644 --- a/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlpreview/CMakeLists.txt @@ -24,12 +24,10 @@ qt_add_test(tst_qqmlpreview ../../../../../src/plugins/qmltooling/qmldbg_preview ../../../shared ../shared - LIBRARIES - Qt::QmlDebugPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml - Qt::QmlDebug + Qt::QmlDebugPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt index c1c588b798..0972273b03 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt +++ b/tests/auto/qml/debugger/qqmlprofilerservice/CMakeLists.txt @@ -19,12 +19,10 @@ qt_add_test(tst_qqmlprofilerservice INCLUDE_DIRECTORIES ../../../shared ../shared - LIBRARIES - Qt::GuiPrivate - Qt::QmlDebugPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::QmlDebug + Qt::GuiPrivate + Qt::QmlDebugPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt index 61ba310c9e..8d8aeb396b 100644 --- a/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt +++ b/tests/auto/qml/debugger/qv4debugger/CMakeLists.txt @@ -12,14 +12,12 @@ qt_add_test(tst_qv4debugger tst_qv4debugger.cpp INCLUDE_DIRECTORIES ../../../../../src/plugins/qmltooling/qmldbg_debugger - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml + Qt::QmlPrivate ) ## Scopes: diff --git a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt index 5ec6cb6257..434c207024 100644 --- a/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt +++ b/tests/auto/qml/ecmascripttests/qjstest/CMakeLists.txt @@ -12,11 +12,9 @@ qt_add_tool(qjstest QT_DEPRECATED_WARNINGS INCLUDE_DIRECTORIES . - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qjstest.pro:<TRUE>: diff --git a/tests/auto/qml/parserstress/CMakeLists.txt b/tests/auto/qml/parserstress/CMakeLists.txt index bbd29fa6a5..e18c6fd8fe 100644 --- a/tests/auto/qml/parserstress/CMakeLists.txt +++ b/tests/auto/qml/parserstress/CMakeLists.txt @@ -13,13 +13,11 @@ list(APPEND test_data ${test_data_glob}) qt_add_test(tst_parserstress SOURCES tst_parserstress.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qjsengine/CMakeLists.txt b/tests/auto/qml/qjsengine/CMakeLists.txt index 8e406e92ca..aaff27ee03 100644 --- a/tests/auto/qml/qjsengine/CMakeLists.txt +++ b/tests/auto/qml/qjsengine/CMakeLists.txt @@ -13,12 +13,11 @@ list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qjsengine SOURCES tst_qjsengine.cpp - LIBRARIES - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Widgets TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qjsonbinding/CMakeLists.txt b/tests/auto/qml/qjsonbinding/CMakeLists.txt index ef9612d5db..f0bf6ef46d 100644 --- a/tests/auto/qml/qjsonbinding/CMakeLists.txt +++ b/tests/auto/qml/qjsonbinding/CMakeLists.txt @@ -16,10 +16,9 @@ qt_add_test(tst_qjsonbinding tst_qjsonbinding.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qjsvalue/CMakeLists.txt b/tests/auto/qml/qjsvalue/CMakeLists.txt index 43f4a0d543..74789968d3 100644 --- a/tests/auto/qml/qjsvalue/CMakeLists.txt +++ b/tests/auto/qml/qjsvalue/CMakeLists.txt @@ -7,12 +7,11 @@ qt_add_test(tst_qjsvalue SOURCES tst_qjsvalue.cpp tst_qjsvalue.h - LIBRARIES - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Widgets ) diff --git a/tests/auto/qml/qmlcachegen/CMakeLists.txt b/tests/auto/qml/qmlcachegen/CMakeLists.txt index 296e708ab4..457fb328d0 100644 --- a/tests/auto/qml/qmlcachegen/CMakeLists.txt +++ b/tests/auto/qml/qmlcachegen/CMakeLists.txt @@ -16,12 +16,10 @@ qt_add_test(tst_qmlcachegen tst_qmlcachegen.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt index 47bd9f64cd..86bcca1bba 100644 --- a/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt +++ b/tests/auto/qml/qmldiskcache/.prev_CMakeLists.txt @@ -7,12 +7,10 @@ qt_add_test(tst_qmldiskcache SOURCES tst_qmldiskcache.cpp - LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::Qml + Qt::QmlPrivate ) # Resources: diff --git a/tests/auto/qml/qmldiskcache/CMakeLists.txt b/tests/auto/qml/qmldiskcache/CMakeLists.txt index 2d46117815..b4ff957331 100644 --- a/tests/auto/qml/qmldiskcache/CMakeLists.txt +++ b/tests/auto/qml/qmldiskcache/CMakeLists.txt @@ -7,12 +7,10 @@ qt_add_test(tst_qmldiskcache SOURCES tst_qmldiskcache.cpp - LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::Qml + Qt::QmlPrivate ) # special case begin diff --git a/tests/auto/qml/qqmlbinding/CMakeLists.txt b/tests/auto/qml/qqmlbinding/CMakeLists.txt index d4ac2e7dad..35cf1244be 100644 --- a/tests/auto/qml/qqmlbinding/CMakeLists.txt +++ b/tests/auto/qml/qqmlbinding/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qqmlbinding tst_qqmlbinding.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlchangeset/CMakeLists.txt b/tests/auto/qml/qqmlchangeset/CMakeLists.txt index c8da32eff8..fafffa2a68 100644 --- a/tests/auto/qml/qqmlchangeset/CMakeLists.txt +++ b/tests/auto/qml/qqmlchangeset/CMakeLists.txt @@ -7,15 +7,12 @@ qt_add_test(tst_qqmlhangeset SOURCES tst_qqmlchangeset.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels ) ## Scopes: diff --git a/tests/auto/qml/qqmlcomponent/CMakeLists.txt b/tests/auto/qml/qqmlcomponent/CMakeLists.txt index 41f844d369..65fad5f210 100644 --- a/tests/auto/qml/qqmlcomponent/CMakeLists.txt +++ b/tests/auto/qml/qqmlcomponent/CMakeLists.txt @@ -17,16 +17,13 @@ qt_add_test(tst_qqmlcomponent tst_qqmlcomponent.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlconnections/CMakeLists.txt b/tests/auto/qml/qqmlconnections/CMakeLists.txt index 22f2a86278..e7f0d87b0f 100644 --- a/tests/auto/qml/qqmlconnections/CMakeLists.txt +++ b/tests/auto/qml/qqmlconnections/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qqmlconnections tst_qqmlconnections.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlconsole/CMakeLists.txt b/tests/auto/qml/qqmlconsole/CMakeLists.txt index 25c726e8fd..3659532a23 100644 --- a/tests/auto/qml/qqmlconsole/CMakeLists.txt +++ b/tests/auto/qml/qqmlconsole/CMakeLists.txt @@ -16,10 +16,9 @@ qt_add_test(tst_qqmlconsole tst_qqmlconsole.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlcontext/CMakeLists.txt b/tests/auto/qml/qqmlcontext/CMakeLists.txt index a3c08a67f7..36b8d7c3e8 100644 --- a/tests/auto/qml/qqmlcontext/CMakeLists.txt +++ b/tests/auto/qml/qqmlcontext/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlcontext tst_qqmlcontext.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlcpputils/CMakeLists.txt b/tests/auto/qml/qqmlcpputils/CMakeLists.txt index 8b12231c2a..ad6febe94f 100644 --- a/tests/auto/qml/qqmlcpputils/CMakeLists.txt +++ b/tests/auto/qml/qqmlcpputils/CMakeLists.txt @@ -7,13 +7,11 @@ qt_add_test(tst_qqmlcpputils SOURCES tst_qqmlcpputils.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/qqmldirparser/CMakeLists.txt b/tests/auto/qml/qqmldirparser/CMakeLists.txt index 9a408dfd4a..5a3b63f336 100644 --- a/tests/auto/qml/qqmldirparser/CMakeLists.txt +++ b/tests/auto/qml/qqmldirparser/CMakeLists.txt @@ -16,11 +16,10 @@ qt_add_test(tst_qqmldirparser tst_qqmldirparser.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt index 8c57d85eb7..8f50334294 100644 --- a/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlecmascript/.prev_CMakeLists.txt @@ -18,14 +18,12 @@ qt_add_test(tst_qqmlecmascript tst_qqmlecmascript.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlecmascript/CMakeLists.txt b/tests/auto/qml/qqmlecmascript/CMakeLists.txt index 72ec67ba9f..17fed700c8 100644 --- a/tests/auto/qml/qqmlecmascript/CMakeLists.txt +++ b/tests/auto/qml/qqmlecmascript/CMakeLists.txt @@ -18,14 +18,12 @@ qt_add_test(tst_qqmlecmascript tst_qqmlecmascript.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlengine/CMakeLists.txt b/tests/auto/qml/qqmlengine/CMakeLists.txt index 0c87451873..38e84ffd30 100644 --- a/tests/auto/qml/qqmlengine/CMakeLists.txt +++ b/tests/auto/qml/qqmlengine/CMakeLists.txt @@ -16,14 +16,12 @@ qt_add_test(tst_qqmlengine tst_qqmlengine.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt index 3dad2d2ce9..2a25d29c43 100644 --- a/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt +++ b/tests/auto/qml/qqmlenginecleanup/CMakeLists.txt @@ -10,11 +10,10 @@ qt_add_test(tst_qqmlenginecleanup tst_qqmlenginecleanup.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml + Qt::QmlPrivate ) ## Scopes: diff --git a/tests/auto/qml/qqmlerror/CMakeLists.txt b/tests/auto/qml/qqmlerror/CMakeLists.txt index a63125137b..91085f74d6 100644 --- a/tests/auto/qml/qqmlerror/CMakeLists.txt +++ b/tests/auto/qml/qqmlerror/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlerror tst_qqmlerror.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlexpression/CMakeLists.txt b/tests/auto/qml/qqmlexpression/CMakeLists.txt index 39ded1e25d..f274d60367 100644 --- a/tests/auto/qml/qqmlexpression/CMakeLists.txt +++ b/tests/auto/qml/qqmlexpression/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlexpression tst_qqmlexpression.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlfileselector/CMakeLists.txt b/tests/auto/qml/qqmlfileselector/CMakeLists.txt index 4b85b1c94b..6886391678 100644 --- a/tests/auto/qml/qqmlfileselector/CMakeLists.txt +++ b/tests/auto/qml/qqmlfileselector/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlfileselector tst_qqmlfileselector.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlglobal/CMakeLists.txt b/tests/auto/qml/qqmlglobal/CMakeLists.txt index fa6832b178..50ced86ee4 100644 --- a/tests/auto/qml/qqmlglobal/CMakeLists.txt +++ b/tests/auto/qml/qqmlglobal/CMakeLists.txt @@ -7,13 +7,11 @@ qt_add_test(tst_qqmlglobal SOURCES tst_qqmlglobal.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/qqmlimport/CMakeLists.txt b/tests/auto/qml/qqmlimport/CMakeLists.txt index b965a224c6..c4b5ac84b7 100644 --- a/tests/auto/qml/qqmlimport/CMakeLists.txt +++ b/tests/auto/qml/qqmlimport/CMakeLists.txt @@ -28,11 +28,10 @@ qt_add_test(tst_qqmlimport tst_qqmlimport.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml + Qt::QmlPrivate Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlincubator/CMakeLists.txt b/tests/auto/qml/qqmlincubator/CMakeLists.txt index a2feb956dc..40fcaa2f6a 100644 --- a/tests/auto/qml/qqmlincubator/CMakeLists.txt +++ b/tests/auto/qml/qqmlincubator/CMakeLists.txt @@ -17,14 +17,12 @@ qt_add_test(tst_qqmlincubator tst_qqmlincubator.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlinfo/CMakeLists.txt b/tests/auto/qml/qqmlinfo/CMakeLists.txt index d6e345a859..55dc018552 100644 --- a/tests/auto/qml/qqmlinfo/CMakeLists.txt +++ b/tests/auto/qml/qqmlinfo/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlinfo tst_qqmlinfo.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt index 3503458a9a..b6d6e2b48e 100644 --- a/tests/auto/qml/qqmlinstantiator/CMakeLists.txt +++ b/tests/auto/qml/qqmlinstantiator/CMakeLists.txt @@ -17,15 +17,12 @@ qt_add_test(tst_qqmlinstantiator tst_qqmlinstantiator.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmllanguage/CMakeLists.txt b/tests/auto/qml/qqmllanguage/CMakeLists.txt index eec5b82607..2e2ad71601 100644 --- a/tests/auto/qml/qqmllanguage/CMakeLists.txt +++ b/tests/auto/qml/qqmllanguage/CMakeLists.txt @@ -18,14 +18,12 @@ qt_add_test(tst_qqmllanguage tst_qqmllanguage.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt index 49859e70f2..940a41f5cd 100644 --- a/tests/auto/qml/qqmllistcompositor/CMakeLists.txt +++ b/tests/auto/qml/qqmllistcompositor/CMakeLists.txt @@ -7,17 +7,13 @@ qt_add_test(tst_qqmllistcompositor SOURCES tst_qqmllistcompositor.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick ) ## Scopes: diff --git a/tests/auto/qml/qqmllistmodel/CMakeLists.txt b/tests/auto/qml/qqmllistmodel/CMakeLists.txt index 44589cbc76..05ff9268e6 100644 --- a/tests/auto/qml/qqmllistmodel/CMakeLists.txt +++ b/tests/auto/qml/qqmllistmodel/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qqmllistmodel tst_qqmllistmodel.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt index 2e689e0afe..9f4fdb61a4 100644 --- a/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt +++ b/tests/auto/qml/qqmllistmodelworkerscript/CMakeLists.txt @@ -16,17 +16,13 @@ qt_add_test(tst_qqmllistmodelworkerscript tst_qqmllistmodelworkerscript.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmllistreference/CMakeLists.txt b/tests/auto/qml/qqmllistreference/CMakeLists.txt index 0dc3394971..da8c3bc7bc 100644 --- a/tests/auto/qml/qqmllistreference/CMakeLists.txt +++ b/tests/auto/qml/qqmllistreference/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qqmllistreference tst_qqmllistreference.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmllocale/CMakeLists.txt b/tests/auto/qml/qqmllocale/CMakeLists.txt index 139582c1a7..03a3bd4de0 100644 --- a/tests/auto/qml/qqmllocale/CMakeLists.txt +++ b/tests/auto/qml/qqmllocale/CMakeLists.txt @@ -16,10 +16,9 @@ qt_add_test(tst_qqmllocale tst_qqmllocale.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt index 2ca7b78d11..93c88dd2ce 100644 --- a/tests/auto/qml/qqmlmetaobject/CMakeLists.txt +++ b/tests/auto/qml/qqmlmetaobject/CMakeLists.txt @@ -16,10 +16,9 @@ qt_add_test(tst_qqmlmetaobject tst_qqmlmetaobject.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlmetatype/CMakeLists.txt b/tests/auto/qml/qqmlmetatype/CMakeLists.txt index 1f22d176f9..ab13460c19 100644 --- a/tests/auto/qml/qqmlmetatype/CMakeLists.txt +++ b/tests/auto/qml/qqmlmetatype/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlmetatype tst_qqmlmetatype.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt index d03442b163..d337235cd8 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(invalidFirstCommandModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:invalidFirstCommandModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt index 6bb1cbb689..c580c9d517 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidFirstCommandModule/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(invalidFirstCommandModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidFirstCommandModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:invalidFirstCommandModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt index bf9ed44b68..9c762abc48 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(invalidNamespaceModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:invalidNamespaceModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt index 416916a9c8..a223ecffbf 100644 --- a/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/invalidNamespaceModule/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(invalidNamespaceModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/InvalidNamespaceModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:invalidNamespaceModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f420295e84 --- /dev/null +++ b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/.prev_CMakeLists.txt @@ -0,0 +1,27 @@ +# Generated from moduleWithQmlSingleton.pro. + +##################################################################### +## moduleWithQmlSingleton Generic Library: +##################################################################### + +qt_add_cmake_library(moduleWithQmlSingleton + MODULE + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton" + SOURCES + plugin.cpp + PUBLIC_LIBRARIES + Qt::Core + Qt::CorePrivate + Qt::GuiPrivate + Qt::Qml + Qt::QmlPrivate +) + +#### Keys ignored in scope 1:.:.:moduleWithQmlSingleton.pro:<TRUE>: +# COPIES = "importfiles" "subfiles" +# IMPORT_FILES = "qmldir" "MySingleton.qml" "MySingleton2.qml" +# TEMPLATE = "lib" +# subfiles.files = "internal/InternalType.qml" +# subfiles.path = "$$DESTDIR/internal" + +qt_autogen_tools_initial_setup(moduleWithQmlSingleton) diff --git a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt index 2aab03bdfb..e0f8f3043a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/moduleWithQmlSingleton/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(moduleWithQmlSingleton OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ModuleWithQmlSingleton" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:moduleWithQmlSingleton.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt index 59bc23604e..8a5bfaab59 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/.prev_CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(nestedPlugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" SOURCES nestedPlugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:nestedPlugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt index ea035b9815..abaf01573a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(nestedPlugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" SOURCES nestedPlugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:nestedPlugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt index 793ef68eb8..fd9a4a9038 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(nonstrictModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:nonstrictModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt index 6739b18c53..c871907e01 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nonstrictModule/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(nonstrictModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/NonstrictModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:nonstrictModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt index 0ace521a5d..8bb52a6323 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin.2.1 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.2.1.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt index 5f008737f7..9d1f1c1ca8 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin.2.1 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.1" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.2.1.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt index caa119c2d3..d945c031cb 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/.prev_CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" SOURCES childplugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt index 8cb9cc3740..95a9153499 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(childplugin.2.1 # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" SOURCES childplugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt index 8d344ca55a..b4af645c81 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin.2.2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.2.2.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt index 48ebf86a07..e2b36e8f09 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.2/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin.2.2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2.2" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.2.2.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt index ece805b2a8..1cbd74d97a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin.2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.2.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt index c1827202e0..0a546866de 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin.2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType.2" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.2.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt index 7446fa49c3..036b2237a5 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/.prev_CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" SOURCES childplugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt index ebf8b65f38..aeab9f84fa 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(childplugin.2 # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" SOURCES childplugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt index f9f5f1ea92..4de3788caa 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt index ced3e394bc..50e30ecf09 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(plugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlPluginType" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:plugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt index ff70bc3f61..e137159431 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/.prev_CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" SOURCES childplugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt index 0490d76d80..bc7d85029a 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt @@ -8,14 +8,12 @@ qt_add_cmake_library(childplugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" SOURCES childplugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:childplugin.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt index 651a4e124b..0d27da3434 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(pluginMixed OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginMixed.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt index a31f9d7a91..967868a674 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginMixed/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(pluginMixed OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlMixedPluginType" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginMixed.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt index fe49c797b4..278d100ed9 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(pluginVersion OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginVersion.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt index 2c7d69e408..7e58ea3b18 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginVersion/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(pluginVersion OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlVersionPluginType" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginVersion.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt index 825d30bea9..7db53592e1 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(pluginWithQmlFile OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginWithQmlFile.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt index 29fa258de8..ad21516b1c 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWithQmlFile/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(pluginWithQmlFile OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestPluginWithQmlFile" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginWithQmlFile.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt index 94e7013e32..93a10a2169 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(Plugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginWrongCase.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt index b14b40fd78..7938f93465 100644 --- a/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/pluginWrongCase/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(Plugin OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/WrongCase" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:pluginWrongCase.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt index 9b37de6443..1e803e65af 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(preemptedStrictModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:preemptedStrictModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt index 7068f51f03..2c13ea8aa6 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptedStrictModule/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(preemptedStrictModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptedStrictModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:preemptedStrictModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt index 5ed3768a75..3addc1aacb 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(preemptiveModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:preemptiveModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt index 7e8b4d0739..d473bff09c 100644 --- a/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/preemptiveModule/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(preemptiveModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/PreemptiveModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:preemptiveModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt index 65b4d1bc40..5ff2840aef 100644 --- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(protectedModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:protectedModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt index be50685c09..24da9a078e 100644 --- a/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/protectedModule/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(protectedModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/ProtectedModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:protectedModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt index d57f762100..d832421c8f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(strictModule.2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:strictModule.2.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt index 6229b9efaf..9b69cf90ca 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule.2/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(strictModule.2 OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule.2" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:strictModule.2.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt index d76e1600ae..f8bb888bd9 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/.prev_CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(strictModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:strictModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt index 4a5a79be4d..d3013fef73 100644 --- a/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/strictModule/CMakeLists.txt @@ -9,14 +9,12 @@ qt_add_cmake_library(strictModule OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/StrictModule" SOURCES plugin.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::CorePrivate + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:strictModule.pro:<TRUE>: diff --git a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt index 6be3149ccb..347a68a8de 100644 --- a/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt +++ b/tests/auto/qml/qqmlobjectmodel/CMakeLists.txt @@ -7,14 +7,12 @@ qt_add_test(tst_qqmlobjectmodel SOURCES tst_qqmlobjectmodel.cpp - LIBRARIES - Qt::CorePrivate - Qt::QmlModelsPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Qml - Qt::QmlModels + Qt::QmlModelsPrivate + Qt::QmlPrivate ) ## Scopes: diff --git a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt index b20b8363e3..361ea61ae9 100644 --- a/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt +++ b/tests/auto/qml/qqmlopenmetaobject/CMakeLists.txt @@ -7,13 +7,11 @@ qt_add_test(tst_qqmlopenmetaobject SOURCES tst_qqmlopenmetaobject.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml ) ## Scopes: diff --git a/tests/auto/qml/qqmlparser/CMakeLists.txt b/tests/auto/qml/qqmlparser/CMakeLists.txt index 909e3ff3e2..f6fad897ca 100644 --- a/tests/auto/qml/qqmlparser/CMakeLists.txt +++ b/tests/auto/qml/qqmlparser/CMakeLists.txt @@ -18,11 +18,9 @@ qt_add_test(tst_qqmlparser SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlpromise/CMakeLists.txt b/tests/auto/qml/qqmlpromise/CMakeLists.txt index 06cbfdf714..870bdef320 100644 --- a/tests/auto/qml/qqmlpromise/CMakeLists.txt +++ b/tests/auto/qml/qqmlpromise/CMakeLists.txt @@ -18,13 +18,11 @@ qt_add_test(tst_qqmlpromise QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlproperty/CMakeLists.txt b/tests/auto/qml/qqmlproperty/CMakeLists.txt index 0bb6c9e2e7..dbe648bd2f 100644 --- a/tests/auto/qml/qqmlproperty/CMakeLists.txt +++ b/tests/auto/qml/qqmlproperty/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlproperty tst_qqmlproperty.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt index 5666ca191c..53a3c7b5dc 100644 --- a/tests/auto/qml/qqmlpropertycache/CMakeLists.txt +++ b/tests/auto/qml/qqmlpropertycache/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmlpropertycache tst_qqmlpropertycache.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt index b388266e88..a327b2a500 100644 --- a/tests/auto/qml/qqmlpropertymap/CMakeLists.txt +++ b/tests/auto/qml/qqmlpropertymap/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qqmlpropertymap tst_qqmlpropertymap.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlqt/CMakeLists.txt b/tests/auto/qml/qqmlqt/CMakeLists.txt index e81e9cba58..6b742636dc 100644 --- a/tests/auto/qml/qqmlqt/CMakeLists.txt +++ b/tests/auto/qml/qqmlqt/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qqmlqt tst_qqmlqt.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt index 23b57c97fb..a5785fb650 100644 --- a/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt +++ b/tests/auto/qml/qqmlsqldatabase/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qqmlsqldatabase tst_qqmlsqldatabase.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick Qt::Sql TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt index dc954aea26..d826173665 100644 --- a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt +++ b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt @@ -10,15 +10,12 @@ qt_add_test(tst_qqmlstatemachine tst_qqmlstatemachine.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/qml/qqmltablemodel/CMakeLists.txt b/tests/auto/qml/qqmltablemodel/CMakeLists.txt index 7c25f12c94..f41e565178 100644 --- a/tests/auto/qml/qqmltablemodel/CMakeLists.txt +++ b/tests/auto/qml/qqmltablemodel/CMakeLists.txt @@ -16,13 +16,12 @@ qt_add_test(tst_qqmltablemodel tst_qqmltablemodel.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml + Qt::QmlPrivate Qt::Quick + Qt::QuickPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmltimer/CMakeLists.txt b/tests/auto/qml/qqmltimer/CMakeLists.txt index eadc846d71..aeb299c914 100644 --- a/tests/auto/qml/qqmltimer/CMakeLists.txt +++ b/tests/auto/qml/qqmltimer/CMakeLists.txt @@ -7,15 +7,12 @@ qt_add_test(tst_qqmltimer SOURCES tst_qqmltimer.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt index d835cf8773..b33258c937 100644 --- a/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmltranslation/.prev_CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmltranslation tst_qqmltranslation.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmltranslation/CMakeLists.txt b/tests/auto/qml/qqmltranslation/CMakeLists.txt index 45fc4c234f..b1cd51b9e9 100644 --- a/tests/auto/qml/qqmltranslation/CMakeLists.txt +++ b/tests/auto/qml/qqmltranslation/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qqmltranslation tst_qqmltranslation.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmltypeloader/CMakeLists.txt b/tests/auto/qml/qqmltypeloader/CMakeLists.txt index 9c2f992745..02b4ec6059 100644 --- a/tests/auto/qml/qqmltypeloader/CMakeLists.txt +++ b/tests/auto/qml/qqmltypeloader/CMakeLists.txt @@ -1,4 +1,4 @@ -# Generated from qqmltypeloader.pro. +# Generated from tst_qqmltypeloader.pro. ##################################################################### ## tst_qqmltypeloader Test: @@ -18,15 +18,15 @@ qt_add_test(tst_qqmltypeloader tst_qqmltypeloader.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::Gui Qt::Qml + Qt::QmlPrivate Qt::Quick TESTDATA ${test_data} ) -#### Keys ignored in scope 2:.:.:tst_qqmltypeloader.pro:<TRUE>: +#### Keys ignored in scope 1:.:.:tst_qqmltypeloader.pro:<TRUE>: # QML_IMPORT_NAME = "declarative.import.for.typeloader.test" # QML_IMPORT_VERSION = "3.2" @@ -50,4 +50,3 @@ set_target_properties(tst_qqmltypeloader PROPERTIES ) qt6_qml_type_registration(tst_qqmltypeloader) -add_subdirectory(SlowImport) diff --git a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt index c11d932c65..9c6e82e345 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt +++ b/tests/auto/qml/qqmlvaluetypeproviders/CMakeLists.txt @@ -17,15 +17,12 @@ qt_add_test(tst_qqmlvaluetypeproviders tst_qqmlvaluetypeproviders.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt index ce5ff68040..530ab2352d 100644 --- a/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt +++ b/tests/auto/qml/qqmlvaluetypes/CMakeLists.txt @@ -17,15 +17,12 @@ qt_add_test(tst_qqmlvaluetypes tst_qqmlvaluetypes.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt index 547f323190..8a25ab6c27 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt +++ b/tests/auto/qml/qqmlxmlhttprequest/CMakeLists.txt @@ -17,14 +17,12 @@ qt_add_test(tst_qqmlxmlhttprequest tst_qqmlxmlhttprequest.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt index eee005c48a..c35afd5081 100644 --- a/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt +++ b/tests/auto/qml/qquickfolderlistmodel/.prev_CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qquickfolderlistmodel tst_qquickfolderlistmodel.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt index 5938a36f6f..fdfe9967bb 100644 --- a/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt +++ b/tests/auto/qml/qquickfolderlistmodel/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qquickfolderlistmodel tst_qquickfolderlistmodel.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qquickworkerscript/CMakeLists.txt b/tests/auto/qml/qquickworkerscript/CMakeLists.txt index 511144c6af..7445ade3cd 100644 --- a/tests/auto/qml/qquickworkerscript/CMakeLists.txt +++ b/tests/auto/qml/qquickworkerscript/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickworkerscript tst_qquickworkerscript.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QmlWorkerScriptPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlWorkerScript TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qtqmlmodules/CMakeLists.txt b/tests/auto/qml/qtqmlmodules/CMakeLists.txt index 190a8d3034..210af57e23 100644 --- a/tests/auto/qml/qtqmlmodules/CMakeLists.txt +++ b/tests/auto/qml/qtqmlmodules/CMakeLists.txt @@ -16,13 +16,11 @@ qt_add_test(tst_qtqmlmodules tst_qtqmlmodules.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qv4assembler/CMakeLists.txt b/tests/auto/qml/qv4assembler/CMakeLists.txt index b16aaf9f3f..13ce682c9a 100644 --- a/tests/auto/qml/qv4assembler/CMakeLists.txt +++ b/tests/auto/qml/qv4assembler/CMakeLists.txt @@ -16,11 +16,9 @@ qt_add_test(tst_qv4assembler tst_qv4assembler.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qv4identifiertable/CMakeLists.txt b/tests/auto/qml/qv4identifiertable/CMakeLists.txt index dd31cde5ad..8606bb0d3a 100644 --- a/tests/auto/qml/qv4identifiertable/CMakeLists.txt +++ b/tests/auto/qml/qv4identifiertable/CMakeLists.txt @@ -7,11 +7,10 @@ qt_add_test(tst_qv4identifiertable SOURCES tst_qv4identifiertable.cpp - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml + Qt::QmlPrivate ) ## Scopes: diff --git a/tests/auto/qml/qv4mm/CMakeLists.txt b/tests/auto/qml/qv4mm/CMakeLists.txt index bd7c328acf..b4c4c82f4f 100644 --- a/tests/auto/qml/qv4mm/CMakeLists.txt +++ b/tests/auto/qml/qv4mm/CMakeLists.txt @@ -16,11 +16,10 @@ qt_add_test(tst_qv4mm tst_qv4mm.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml + Qt::QmlPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/qml/qv4regexp/CMakeLists.txt b/tests/auto/qml/qv4regexp/CMakeLists.txt index 5eb99906b1..bba8314256 100644 --- a/tests/auto/qml/qv4regexp/CMakeLists.txt +++ b/tests/auto/qml/qv4regexp/CMakeLists.txt @@ -7,11 +7,10 @@ qt_add_test(tst_qv4regexp SOURCES tst_qv4regexp.cpp - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml + Qt::QmlPrivate ) ## Scopes: diff --git a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt index fb6f9c9d6b..2596f05930 100644 --- a/tests/auto/qml/qwidgetsinqml/CMakeLists.txt +++ b/tests/auto/qml/qwidgetsinqml/CMakeLists.txt @@ -9,10 +9,9 @@ qt_add_test(tst_qwidgetsinqml tst_qwidgetsinqml.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Qml Qt::Widgets ) diff --git a/tests/auto/qml/v4misc/CMakeLists.txt b/tests/auto/qml/v4misc/CMakeLists.txt index 75e7dcc88b..65a2d26139 100644 --- a/tests/auto/qml/v4misc/CMakeLists.txt +++ b/tests/auto/qml/v4misc/CMakeLists.txt @@ -7,12 +7,10 @@ qt_add_test(tst_v4misc SOURCES tst_v4misc.cpp - LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui - Qt::Qml + Qt::QmlPrivate ) ## Scopes: diff --git a/tests/auto/qmldevtools/compile/CMakeLists.txt b/tests/auto/qmldevtools/compile/CMakeLists.txt index 11cfb05078..d569135990 100644 --- a/tests/auto/qmldevtools/compile/CMakeLists.txt +++ b/tests/auto/qmldevtools/compile/CMakeLists.txt @@ -8,11 +8,9 @@ qt_add_executable(tst_compile GUI SOURCES tst_compile.cpp - LIBRARIES - Qt::QmlDevToolsPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::QmlDevTools + Qt::QmlDevToolsPrivate ) #### Keys ignored in scope 1:.:.:compile.pro:<TRUE>: @@ -22,10 +20,8 @@ qt_add_executable(tst_compile ##################################################################### qt_extend_target(tst_compile CONDITION force_bootstrap - LIBRARIES - Qt::BootstrapPrivate PUBLIC_LIBRARIES - Qt::Bootstrap + Qt::BootstrapPrivate ) qt_extend_target(tst_compile CONDITION NOT force_bootstrap diff --git a/tests/auto/quick/examples/CMakeLists.txt b/tests/auto/quick/examples/CMakeLists.txt index ec5c67ad15..74efa0ad40 100644 --- a/tests/auto/quick/examples/CMakeLists.txt +++ b/tests/auto/quick/examples/CMakeLists.txt @@ -9,15 +9,12 @@ qt_add_test(tst_examples tst_examples.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:examples.pro:<TRUE>: diff --git a/tests/auto/quick/geometry/CMakeLists.txt b/tests/auto/quick/geometry/CMakeLists.txt index 14678773b9..5a791a8a9e 100644 --- a/tests/auto/quick/geometry/CMakeLists.txt +++ b/tests/auto/quick/geometry/CMakeLists.txt @@ -7,15 +7,12 @@ qt_add_test(tst_geometry SOURCES tst_geometry.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/nodes/CMakeLists.txt b/tests/auto/quick/nodes/CMakeLists.txt index f0b52003cf..825442479f 100644 --- a/tests/auto/quick/nodes/CMakeLists.txt +++ b/tests/auto/quick/nodes/CMakeLists.txt @@ -7,15 +7,12 @@ qt_add_test(tst_nodestest SOURCES tst_nodestest.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/nokeywords/CMakeLists.txt b/tests/auto/quick/nokeywords/CMakeLists.txt index 23ca61f299..bdf29817c0 100644 --- a/tests/auto/quick/nokeywords/CMakeLists.txt +++ b/tests/auto/quick/nokeywords/CMakeLists.txt @@ -7,15 +7,13 @@ qt_add_test(tst_nokeywords SOURCES tst_nokeywords.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml Qt::Quick + Qt::QuickPrivate ) ## Scopes: diff --git a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt index 3e2c17364a..86f5a1dae5 100644 --- a/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/flickableinterop/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_flickableinterop QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt index f9eda5cac2..3ea3d2d03b 100644 --- a/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/multipointtoucharea_interop/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_multipointtoucharea_interop QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt index 114c4faa12..13d399768c 100644 --- a/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickdraghandler/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickdraghandler QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt index 90a3f848f2..38f25e2764 100644 --- a/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickhoverhandler/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickhoverhandler QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt index f2eeab2ea9..369cf0ae0c 100644 --- a/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpinchhandler/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickpinchhandler QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt index b7d94b2e97..4b4e453105 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointerhandler/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickpointerhandler QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt index fc2fe64393..788a0bdfa3 100644 --- a/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickpointhandler/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickpointhandler QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt index 8e0353f717..a8a9d5ae17 100644 --- a/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquicktaphandler QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt index b8432c10b5..0d599fed4e 100644 --- a/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt +++ b/tests/auto/quick/pointerhandlers/qquickwheelhandler/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickwheelhandler QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/propertyrequirements/CMakeLists.txt b/tests/auto/quick/propertyrequirements/CMakeLists.txt index 3c50490bd1..2a37646920 100644 --- a/tests/auto/quick/propertyrequirements/CMakeLists.txt +++ b/tests/auto/quick/propertyrequirements/CMakeLists.txt @@ -7,11 +7,9 @@ qt_add_test(tst_propertyrequirements SOURCES tst_propertyrequirements.cpp - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Qml + Qt::QmlPrivate ) ## Scopes: diff --git a/tests/auto/quick/qquickaccessible/CMakeLists.txt b/tests/auto/quick/qquickaccessible/CMakeLists.txt index 215d31ca17..3b0c4da56c 100644 --- a/tests/auto/quick/qquickaccessible/CMakeLists.txt +++ b/tests/auto/quick/qquickaccessible/CMakeLists.txt @@ -16,16 +16,13 @@ qt_add_test(tst_qquickaccessible tst_qquickaccessible.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickanchors/CMakeLists.txt b/tests/auto/quick/qquickanchors/CMakeLists.txt index 62a35d25c5..05977d740f 100644 --- a/tests/auto/quick/qquickanchors/CMakeLists.txt +++ b/tests/auto/quick/qquickanchors/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickanchors QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt index 7b2afa8cb7..ef7c02e88d 100644 --- a/tests/auto/quick/qquickanimatedimage/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedimage/CMakeLists.txt @@ -17,16 +17,13 @@ qt_add_test(tst_qquickanimatedimage tst_qquickanimatedimage.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt index c79009e674..6deac34ef6 100644 --- a/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt +++ b/tests/auto/quick/qquickanimatedsprite/CMakeLists.txt @@ -16,16 +16,13 @@ qt_add_test(tst_qquickanimatedsprite tst_qquickanimatedsprite.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick Qt::QuickTest TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt index e5822e77e3..f958f9272e 100644 --- a/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt +++ b/tests/auto/quick/qquickanimationcontroller/CMakeLists.txt @@ -15,13 +15,11 @@ qt_add_test(tst_qquickanimationcontroller QMLTEST SOURCES tst_qquickanimationcontroller.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickanimations/CMakeLists.txt b/tests/auto/quick/qquickanimations/CMakeLists.txt index cdd599c8e0..9b556638d3 100644 --- a/tests/auto/quick/qquickanimations/CMakeLists.txt +++ b/tests/auto/quick/qquickanimations/CMakeLists.txt @@ -18,17 +18,13 @@ qt_add_test(tst_qquickanimations QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickanimators/CMakeLists.txt b/tests/auto/quick/qquickanimators/CMakeLists.txt index 969c1ef398..e0a9fa9029 100644 --- a/tests/auto/quick/qquickanimators/CMakeLists.txt +++ b/tests/auto/quick/qquickanimators/CMakeLists.txt @@ -7,15 +7,12 @@ qt_add_test(tst_qquickanimators SOURCES tst_qquickanimators.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquickapplication/CMakeLists.txt b/tests/auto/quick/qquickapplication/CMakeLists.txt index e0c95a46b3..b45f76ca0d 100644 --- a/tests/auto/quick/qquickapplication/CMakeLists.txt +++ b/tests/auto/quick/qquickapplication/CMakeLists.txt @@ -16,15 +16,14 @@ qt_add_test(tst_qquickapplication tst_qquickapplication.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick + Qt::QuickPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickbehaviors/CMakeLists.txt b/tests/auto/quick/qquickbehaviors/CMakeLists.txt index a311447fb4..7596076c00 100644 --- a/tests/auto/quick/qquickbehaviors/CMakeLists.txt +++ b/tests/auto/quick/qquickbehaviors/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickbehaviors tst_qquickbehaviors.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickborderimage/CMakeLists.txt b/tests/auto/quick/qquickborderimage/CMakeLists.txt index 503f64fa01..452f5a729b 100644 --- a/tests/auto/quick/qquickborderimage/CMakeLists.txt +++ b/tests/auto/quick/qquickborderimage/CMakeLists.txt @@ -22,16 +22,13 @@ qt_add_test(tst_qquickborderimage QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt index c9605ad952..7b410e578c 100644 --- a/tests/auto/quick/qquickboundaryrule/CMakeLists.txt +++ b/tests/auto/quick/qquickboundaryrule/CMakeLists.txt @@ -21,15 +21,13 @@ qt_add_test(tst_qquickboundaryrule QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Qml Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt index 67e0f98564..0c935891b4 100644 --- a/tests/auto/quick/qquickcanvasitem/CMakeLists.txt +++ b/tests/auto/quick/qquickcanvasitem/CMakeLists.txt @@ -15,13 +15,11 @@ qt_add_test(tst_qquickcanvasitem QMLTEST SOURCES tst_qquickcanvasitem.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt index b7d26c43fb..8582a77561 100644 --- a/tests/auto/quick/qquickdesignersupport/CMakeLists.txt +++ b/tests/auto/quick/qquickdesignersupport/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickdesignersupport QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickdrag/CMakeLists.txt b/tests/auto/quick/qquickdrag/CMakeLists.txt index cb4e82a73e..046072e769 100644 --- a/tests/auto/quick/qquickdrag/CMakeLists.txt +++ b/tests/auto/quick/qquickdrag/CMakeLists.txt @@ -7,16 +7,13 @@ qt_add_test(tst_qquickdrag SOURCES tst_qquickdrag.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquickdroparea/CMakeLists.txt b/tests/auto/quick/qquickdroparea/CMakeLists.txt index 85353502b1..f711d51b3a 100644 --- a/tests/auto/quick/qquickdroparea/CMakeLists.txt +++ b/tests/auto/quick/qquickdroparea/CMakeLists.txt @@ -21,16 +21,13 @@ qt_add_test(tst_qquickdroparea QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickflickable/CMakeLists.txt b/tests/auto/quick/qquickflickable/CMakeLists.txt index 1284e574c9..99aac8c0f9 100644 --- a/tests/auto/quick/qquickflickable/CMakeLists.txt +++ b/tests/auto/quick/qquickflickable/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickflickable QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickflipable/CMakeLists.txt b/tests/auto/quick/qquickflipable/CMakeLists.txt index 99489be92f..e037cb2870 100644 --- a/tests/auto/quick/qquickflipable/CMakeLists.txt +++ b/tests/auto/quick/qquickflipable/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickflipable tst_qquickflipable.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickfocusscope/CMakeLists.txt b/tests/auto/quick/qquickfocusscope/CMakeLists.txt index ae829dd9e0..987d9f2c08 100644 --- a/tests/auto/quick/qquickfocusscope/CMakeLists.txt +++ b/tests/auto/quick/qquickfocusscope/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickfocusscope QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickfontloader/CMakeLists.txt b/tests/auto/quick/qquickfontloader/CMakeLists.txt index 50a9a3488b..03ff5a1a83 100644 --- a/tests/auto/quick/qquickfontloader/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader/CMakeLists.txt @@ -17,16 +17,13 @@ qt_add_test(tst_qquickfontloader tst_qquickfontloader.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt index f0b157b517..8679830ea4 100644 --- a/tests/auto/quick/qquickfontloader_static/CMakeLists.txt +++ b/tests/auto/quick/qquickfontloader_static/CMakeLists.txt @@ -18,16 +18,13 @@ qt_add_test(tst_qquickfontloader_static QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt index 3f79973de5..7509c6dd86 100644 --- a/tests/auto/quick/qquickfontmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquickfontmetrics/CMakeLists.txt @@ -7,12 +7,10 @@ qt_add_test(tst_quickfontmetrics SOURCES tst_quickfontmetrics.cpp - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml - Qt::Quick + Qt::QuickPrivate ) ## Scopes: diff --git a/tests/auto/quick/qquickgridview/CMakeLists.txt b/tests/auto/quick/qquickgridview/CMakeLists.txt index 8880b57d24..f67fc203d4 100644 --- a/tests/auto/quick/qquickgridview/CMakeLists.txt +++ b/tests/auto/quick/qquickgridview/CMakeLists.txt @@ -21,17 +21,13 @@ qt_add_test(tst_qquickgridview QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick Qt::QuickTest TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickimage/CMakeLists.txt b/tests/auto/quick/qquickimage/CMakeLists.txt index e18d4d47fb..28f09b02d1 100644 --- a/tests/auto/quick/qquickimage/CMakeLists.txt +++ b/tests/auto/quick/qquickimage/CMakeLists.txt @@ -22,16 +22,13 @@ qt_add_test(tst_qquickimage QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickimageprovider/CMakeLists.txt b/tests/auto/quick/qquickimageprovider/CMakeLists.txt index 80826d35fc..7771df4237 100644 --- a/tests/auto/quick/qquickimageprovider/CMakeLists.txt +++ b/tests/auto/quick/qquickimageprovider/CMakeLists.txt @@ -7,16 +7,13 @@ qt_add_test(tst_qquickimageprovider SOURCES tst_qquickimageprovider.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquickitem/CMakeLists.txt b/tests/auto/quick/qquickitem/CMakeLists.txt index af18dca7a2..bb829a99a1 100644 --- a/tests/auto/quick/qquickitem/CMakeLists.txt +++ b/tests/auto/quick/qquickitem/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickitem QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickitem2/CMakeLists.txt b/tests/auto/quick/qquickitem2/CMakeLists.txt index ea6040831e..5177123d6f 100644 --- a/tests/auto/quick/qquickitem2/CMakeLists.txt +++ b/tests/auto/quick/qquickitem2/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickitem2 tst_qquickitem.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickitemlayer/CMakeLists.txt b/tests/auto/quick/qquickitemlayer/CMakeLists.txt index bc145ae48b..25024bce0c 100644 --- a/tests/auto/quick/qquickitemlayer/CMakeLists.txt +++ b/tests/auto/quick/qquickitemlayer/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickitemlayer tst_qquickitemlayer.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicklayouts/CMakeLists.txt b/tests/auto/quick/qquicklayouts/CMakeLists.txt index c3960001c0..f750a4f1c5 100644 --- a/tests/auto/quick/qquicklayouts/CMakeLists.txt +++ b/tests/auto/quick/qquicklayouts/CMakeLists.txt @@ -15,13 +15,11 @@ qt_add_test(tst_qquicklayouts QMLTEST SOURCES tst_qquicklayouts.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicklistview/CMakeLists.txt b/tests/auto/quick/qquicklistview/CMakeLists.txt index c8e102a54b..e983bcac96 100644 --- a/tests/auto/quick/qquicklistview/CMakeLists.txt +++ b/tests/auto/quick/qquicklistview/CMakeLists.txt @@ -25,17 +25,13 @@ qt_add_test(tst_qquicklistview QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick Qt::QuickTest TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickloader/CMakeLists.txt b/tests/auto/quick/qquickloader/CMakeLists.txt index a373976d6d..8ebb9d261f 100644 --- a/tests/auto/quick/qquickloader/CMakeLists.txt +++ b/tests/auto/quick/qquickloader/CMakeLists.txt @@ -22,16 +22,13 @@ qt_add_test(tst_qquickloader QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickmousearea/CMakeLists.txt b/tests/auto/quick/qquickmousearea/CMakeLists.txt index 79d749cae4..f06518d100 100644 --- a/tests/auto/quick/qquickmousearea/CMakeLists.txt +++ b/tests/auto/quick/qquickmousearea/CMakeLists.txt @@ -22,16 +22,13 @@ qt_add_test(tst_qquickmousearea QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt index 97861b99f5..70c533d791 100644 --- a/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt +++ b/tests/auto/quick/qquickmultipointtoucharea/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickmultipointtoucharea QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickpainteditem/CMakeLists.txt b/tests/auto/quick/qquickpainteditem/CMakeLists.txt index ed5ce75b31..c07fff8ef1 100644 --- a/tests/auto/quick/qquickpainteditem/CMakeLists.txt +++ b/tests/auto/quick/qquickpainteditem/CMakeLists.txt @@ -7,16 +7,13 @@ qt_add_test(tst_qquickpainteditem SOURCES tst_qquickpainteditem.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquickpath/CMakeLists.txt b/tests/auto/quick/qquickpath/CMakeLists.txt index 98e24e9864..bae3f9065b 100644 --- a/tests/auto/quick/qquickpath/CMakeLists.txt +++ b/tests/auto/quick/qquickpath/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickpath tst_qquickpath.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickpathview/CMakeLists.txt b/tests/auto/quick/qquickpathview/CMakeLists.txt index 8f9622963f..3a36f7fb2a 100644 --- a/tests/auto/quick/qquickpathview/CMakeLists.txt +++ b/tests/auto/quick/qquickpathview/CMakeLists.txt @@ -21,17 +21,13 @@ qt_add_test(tst_qquickpathview QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick Qt::QuickTest TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickpincharea/CMakeLists.txt b/tests/auto/quick/qquickpincharea/CMakeLists.txt index 3d78622048..6ee34e5ca4 100644 --- a/tests/auto/quick/qquickpincharea/CMakeLists.txt +++ b/tests/auto/quick/qquickpincharea/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickpincharea QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt index 7cecf3e8db..d76a29a861 100644 --- a/tests/auto/quick/qquickpixmapcache/CMakeLists.txt +++ b/tests/auto/quick/qquickpixmapcache/CMakeLists.txt @@ -17,17 +17,14 @@ qt_add_test(tst_qquickpixmapcache tst_qquickpixmapcache.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Concurrent + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Network - Qt::Qml - Qt::Quick + Qt::QmlPrivate + Qt::QuickPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickpositioners/CMakeLists.txt b/tests/auto/quick/qquickpositioners/CMakeLists.txt index 47093891da..ce44673738 100644 --- a/tests/auto/quick/qquickpositioners/CMakeLists.txt +++ b/tests/auto/quick/qquickpositioners/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickpositioners QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick Qt::QuickTest TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickrectangle/CMakeLists.txt b/tests/auto/quick/qquickrectangle/CMakeLists.txt index 2ea94e17ba..0d44623441 100644 --- a/tests/auto/quick/qquickrectangle/CMakeLists.txt +++ b/tests/auto/quick/qquickrectangle/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickrectangle QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickrepeater/CMakeLists.txt b/tests/auto/quick/qquickrepeater/CMakeLists.txt index 75bec8fa5d..3eecbc6c54 100644 --- a/tests/auto/quick/qquickrepeater/CMakeLists.txt +++ b/tests/auto/quick/qquickrepeater/CMakeLists.txt @@ -21,17 +21,13 @@ qt_add_test(tst_qquickrepeater QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickscreen/CMakeLists.txt b/tests/auto/quick/qquickscreen/CMakeLists.txt index 7b04bb863e..201393139a 100644 --- a/tests/auto/quick/qquickscreen/CMakeLists.txt +++ b/tests/auto/quick/qquickscreen/CMakeLists.txt @@ -10,15 +10,12 @@ qt_add_test(tst_qquickscreen tst_qquickscreen.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquickshadereffect/CMakeLists.txt b/tests/auto/quick/qquickshadereffect/CMakeLists.txt index c4a3b39cdb..7d3b7b26be 100644 --- a/tests/auto/quick/qquickshadereffect/CMakeLists.txt +++ b/tests/auto/quick/qquickshadereffect/CMakeLists.txt @@ -10,15 +10,12 @@ qt_add_test(tst_qquickshadereffect tst_qquickshadereffect.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquickshape/CMakeLists.txt b/tests/auto/quick/qquickshape/CMakeLists.txt index 409789903b..fa75b37c1d 100644 --- a/tests/auto/quick/qquickshape/CMakeLists.txt +++ b/tests/auto/quick/qquickshape/CMakeLists.txt @@ -21,17 +21,13 @@ qt_add_test(tst_qquickshape QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate Qt::QuickShapesPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickShapes TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt index 8e7d6d538b..2c1e59e459 100644 --- a/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt +++ b/tests/auto/quick/qquicksmoothedanimation/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquicksmoothedanimation tst_qquicksmoothedanimation.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickspringanimation/CMakeLists.txt b/tests/auto/quick/qquickspringanimation/CMakeLists.txt index 3cb4b781d5..ba86dacc82 100644 --- a/tests/auto/quick/qquickspringanimation/CMakeLists.txt +++ b/tests/auto/quick/qquickspringanimation/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickspringanimation tst_qquickspringanimation.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickspritesequence/CMakeLists.txt b/tests/auto/quick/qquickspritesequence/CMakeLists.txt index 0fcb643b45..bc6711dae3 100644 --- a/tests/auto/quick/qquickspritesequence/CMakeLists.txt +++ b/tests/auto/quick/qquickspritesequence/CMakeLists.txt @@ -16,16 +16,13 @@ qt_add_test(tst_qquickspritesequence tst_qquickspritesequence.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickstates/CMakeLists.txt b/tests/auto/quick/qquickstates/CMakeLists.txt index d33ea3a444..b512e2c8d0 100644 --- a/tests/auto/quick/qquickstates/CMakeLists.txt +++ b/tests/auto/quick/qquickstates/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquickstates tst_qquickstates.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickstyledtext/CMakeLists.txt b/tests/auto/quick/qquickstyledtext/CMakeLists.txt index e8158b803a..bc73e9178c 100644 --- a/tests/auto/quick/qquickstyledtext/CMakeLists.txt +++ b/tests/auto/quick/qquickstyledtext/CMakeLists.txt @@ -7,16 +7,13 @@ qt_add_test(tst_qquickstyledtext SOURCES tst_qquickstyledtext.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquicksystempalette/CMakeLists.txt b/tests/auto/quick/qquicksystempalette/CMakeLists.txt index b3033929b7..57efc14e65 100644 --- a/tests/auto/quick/qquicksystempalette/CMakeLists.txt +++ b/tests/auto/quick/qquicksystempalette/CMakeLists.txt @@ -7,15 +7,12 @@ qt_add_test(tst_qquicksystempalette SOURCES tst_qquicksystempalette.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) ## Scopes: diff --git a/tests/auto/quick/qquicktableview/CMakeLists.txt b/tests/auto/quick/qquicktableview/CMakeLists.txt index 21d8624406..9d61c40cdb 100644 --- a/tests/auto/quick/qquicktableview/CMakeLists.txt +++ b/tests/auto/quick/qquicktableview/CMakeLists.txt @@ -22,17 +22,13 @@ qt_add_test(tst_qquicktableview QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick Qt::QuickTest TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicktext/CMakeLists.txt b/tests/auto/quick/qquicktext/CMakeLists.txt index 60068d5c3e..ba3f9dcbfa 100644 --- a/tests/auto/quick/qquicktext/CMakeLists.txt +++ b/tests/auto/quick/qquicktext/CMakeLists.txt @@ -17,16 +17,13 @@ qt_add_test(tst_qquicktext tst_qquicktext.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick Qt::QuickTest TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicktextdocument/CMakeLists.txt b/tests/auto/quick/qquicktextdocument/CMakeLists.txt index 116ac8af22..6785baad42 100644 --- a/tests/auto/quick/qquicktextdocument/CMakeLists.txt +++ b/tests/auto/quick/qquicktextdocument/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_qquicktextdocument tst_qquicktextdocument.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicktextedit/CMakeLists.txt b/tests/auto/quick/qquicktextedit/CMakeLists.txt index 8ce170eec4..29b6df96c5 100644 --- a/tests/auto/quick/qquicktextedit/CMakeLists.txt +++ b/tests/auto/quick/qquicktextedit/CMakeLists.txt @@ -22,17 +22,13 @@ qt_add_test(tst_qquicktextedit QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::NetworkPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Network - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicktextinput/CMakeLists.txt b/tests/auto/quick/qquicktextinput/CMakeLists.txt index a67c7dc226..22b3e3d953 100644 --- a/tests/auto/quick/qquicktextinput/CMakeLists.txt +++ b/tests/auto/quick/qquicktextinput/CMakeLists.txt @@ -17,15 +17,12 @@ qt_add_test(tst_qquicktextinput tst_qquicktextinput.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt index 8f5001e46c..74e5c2bf7e 100644 --- a/tests/auto/quick/qquicktextmetrics/CMakeLists.txt +++ b/tests/auto/quick/qquicktextmetrics/CMakeLists.txt @@ -7,12 +7,10 @@ qt_add_test(tst_qquicktextmetrics SOURCES tst_qquicktextmetrics.cpp - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml - Qt::Quick + Qt::QuickPrivate ) ## Scopes: diff --git a/tests/auto/quick/qquicktimeline/CMakeLists.txt b/tests/auto/quick/qquicktimeline/CMakeLists.txt index 3b282ce0af..1d31d0b4b9 100644 --- a/tests/auto/quick/qquicktimeline/CMakeLists.txt +++ b/tests/auto/quick/qquicktimeline/CMakeLists.txt @@ -7,15 +7,14 @@ qt_add_test(tst_qquicktimeline SOURCES tst_qquicktimeline.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick + Qt::QuickPrivate ) ## Scopes: diff --git a/tests/auto/quick/qquickview/CMakeLists.txt b/tests/auto/quick/qquickview/CMakeLists.txt index 9216d18ec7..3a677cad94 100644 --- a/tests/auto/quick/qquickview/CMakeLists.txt +++ b/tests/auto/quick/qquickview/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickview QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt index 20aa59cb9f..db88f6eb26 100644 --- a/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt +++ b/tests/auto/quick/qquickvisualdatamodel/CMakeLists.txt @@ -21,17 +21,13 @@ qt_add_test(tst_qquickvisualdatamodel QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlModelsPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/qquickwindow/CMakeLists.txt b/tests/auto/quick/qquickwindow/CMakeLists.txt index 338b6edbbc..3cfe0b4660 100644 --- a/tests/auto/quick/qquickwindow/CMakeLists.txt +++ b/tests/auto/quick/qquickwindow/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_qquickwindow QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/rendernode/CMakeLists.txt b/tests/auto/quick/rendernode/CMakeLists.txt index 2686873672..0291bcc3f4 100644 --- a/tests/auto/quick/rendernode/CMakeLists.txt +++ b/tests/auto/quick/rendernode/CMakeLists.txt @@ -16,15 +16,12 @@ qt_add_test(tst_rendernode tst_rendernode.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quick/scenegraph/CMakeLists.txt b/tests/auto/quick/scenegraph/CMakeLists.txt index 888311d698..4367ed69c7 100644 --- a/tests/auto/quick/scenegraph/CMakeLists.txt +++ b/tests/auto/quick/scenegraph/CMakeLists.txt @@ -15,15 +15,12 @@ qt_add_test(tst_scenegraph QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:scenegraph.pro:<TRUE>: diff --git a/tests/auto/quick/sharedimage/CMakeLists.txt b/tests/auto/quick/sharedimage/CMakeLists.txt index f8c4c707bd..17d2bec634 100644 --- a/tests/auto/quick/sharedimage/CMakeLists.txt +++ b/tests/auto/quick/sharedimage/CMakeLists.txt @@ -13,11 +13,9 @@ list(APPEND test_data ${test_data_glob}) qt_add_test(tst_sharedimage SOURCES tst_sharedimage.cpp - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::Quick + Qt::QuickPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/quick/touchmouse/CMakeLists.txt b/tests/auto/quick/touchmouse/CMakeLists.txt index f8c1e2f186..02e2c1401b 100644 --- a/tests/auto/quick/touchmouse/CMakeLists.txt +++ b/tests/auto/quick/touchmouse/CMakeLists.txt @@ -21,15 +21,12 @@ qt_add_test(tst_touchmouse QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick TESTDATA ${test_data} ) diff --git a/tests/auto/quicktest/polish-qml/CMakeLists.txt b/tests/auto/quicktest/polish-qml/CMakeLists.txt index e870edd415..bd7c739433 100644 --- a/tests/auto/quicktest/polish-qml/CMakeLists.txt +++ b/tests/auto/quicktest/polish-qml/CMakeLists.txt @@ -17,11 +17,10 @@ qt_add_test(tst_polish-qml tst_polish-qml.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Quick + Qt::QuickPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/quicktest/polish/CMakeLists.txt b/tests/auto/quicktest/polish/CMakeLists.txt index ea2bb8818e..946dd32980 100644 --- a/tests/auto/quicktest/polish/CMakeLists.txt +++ b/tests/auto/quicktest/polish/CMakeLists.txt @@ -17,11 +17,10 @@ qt_add_test(tst_polish tst_polish.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Quick + Qt::QuickPrivate TESTDATA ${test_data} ) diff --git a/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt b/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f00249bfc4 --- /dev/null +++ b/tests/auto/quicktest/testfiltering/test/.prev_CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from test.pro. + +##################################################################### +## tst_testfiltering Test: +##################################################################### + +qt_add_test(tst_testfiltering + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" + SOURCES + ../tst_testfiltering.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt index 52b9f4855e..5c161885d2 100644 --- a/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt +++ b/tests/auto/quickwidgets/qquickwidget/CMakeLists.txt @@ -16,19 +16,15 @@ qt_add_test(tst_qquickwidget tst_qquickwidget.cpp INCLUDE_DIRECTORIES ../../shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate + Qt::QuickWidgets Qt::QuickWidgetsPrivate Qt::WidgetsPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickWidgets - Qt::Widgets TESTDATA ${test_data} ) diff --git a/tests/auto/toolsupport/CMakeLists.txt b/tests/auto/toolsupport/CMakeLists.txt index 2c95835f32..65eff5e92e 100644 --- a/tests/auto/toolsupport/CMakeLists.txt +++ b/tests/auto/toolsupport/CMakeLists.txt @@ -7,9 +7,7 @@ qt_add_test(tst_toolsupport SOURCES tst_toolsupport.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml ) diff --git a/tests/benchmarks/particles/affectors/CMakeLists.txt b/tests/benchmarks/particles/affectors/CMakeLists.txt index 35c9e46329..7910d4256d 100644 --- a/tests/benchmarks/particles/affectors/CMakeLists.txt +++ b/tests/benchmarks/particles/affectors/CMakeLists.txt @@ -9,11 +9,9 @@ qt_add_benchmark(tst_affectors tst_affectors.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::QuickParticlesPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::QuickParticles + Qt::QuickParticlesPrivate Qt::Test ) diff --git a/tests/benchmarks/particles/emission/CMakeLists.txt b/tests/benchmarks/particles/emission/CMakeLists.txt index 4347283c06..831b42e7a9 100644 --- a/tests/benchmarks/particles/emission/CMakeLists.txt +++ b/tests/benchmarks/particles/emission/CMakeLists.txt @@ -7,11 +7,9 @@ qt_add_benchmark(tst_emission SOURCES tst_emission.cpp - LIBRARIES - Qt::QuickParticlesPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::QuickParticles + Qt::QuickParticlesPrivate Qt::Test ) diff --git a/tests/benchmarks/qml/animation/CMakeLists.txt b/tests/benchmarks/qml/animation/CMakeLists.txt index bb2e1fe090..a3e2b5a46d 100644 --- a/tests/benchmarks/qml/animation/CMakeLists.txt +++ b/tests/benchmarks/qml/animation/CMakeLists.txt @@ -9,15 +9,13 @@ qt_add_benchmark(tst_animation tst_animation.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Qml Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick Qt::Test ) diff --git a/tests/benchmarks/qml/compilation/CMakeLists.txt b/tests/benchmarks/qml/compilation/CMakeLists.txt index addb108857..a43c62863b 100644 --- a/tests/benchmarks/qml/compilation/CMakeLists.txt +++ b/tests/benchmarks/qml/compilation/CMakeLists.txt @@ -9,12 +9,11 @@ qt_add_benchmark(tst_compilation tst_compilation.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES - Qt::CorePrivate - Qt::QmlPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Qml + Qt::QmlPrivate Qt::Test ) diff --git a/tests/benchmarks/qml/creation/CMakeLists.txt b/tests/benchmarks/qml/creation/CMakeLists.txt index e7cdd60bd5..2210f0a24a 100644 --- a/tests/benchmarks/qml/creation/CMakeLists.txt +++ b/tests/benchmarks/qml/creation/CMakeLists.txt @@ -9,15 +9,12 @@ qt_add_benchmark(tst_creation tst_creation.cpp DEFINES SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick Qt::Test ) diff --git a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt index f5c02ef04e..06a41df546 100644 --- a/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt +++ b/tests/benchmarks/qml/qqmlchangeset/CMakeLists.txt @@ -9,12 +9,10 @@ qt_add_benchmark(tst_qqmlchangeset tst_qqmlchangeset.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml - Qt::Quick + Qt::QuickPrivate Qt::Test ) diff --git a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt index 684f3f194b..a4895d8202 100644 --- a/tests/benchmarks/qml/qquickwindow/CMakeLists.txt +++ b/tests/benchmarks/qml/qquickwindow/CMakeLists.txt @@ -9,17 +9,13 @@ qt_add_benchmark(tst_qquickwindow tst_qquickwindow.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::OpenGLPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::OpenGL - Qt::Qml - Qt::Quick Qt::Test ) diff --git a/tests/benchmarks/qml/script/CMakeLists.txt b/tests/benchmarks/qml/script/CMakeLists.txt index 2a18405b43..76362dc0d9 100644 --- a/tests/benchmarks/qml/script/CMakeLists.txt +++ b/tests/benchmarks/qml/script/CMakeLists.txt @@ -10,15 +10,12 @@ qt_add_benchmark(tst_script DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Gui - Qt::Qml - Qt::Quick Qt::Test ) diff --git a/tests/benchmarks/quick/events/CMakeLists.txt b/tests/benchmarks/quick/events/CMakeLists.txt index 374e3a6094..45300fdb5a 100644 --- a/tests/benchmarks/quick/events/CMakeLists.txt +++ b/tests/benchmarks/quick/events/CMakeLists.txt @@ -15,15 +15,14 @@ qt_add_benchmark(tst_qevents QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" INCLUDE_DIRECTORIES ../../../auto/shared - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml + Qt::QmlPrivate Qt::Quick + Qt::QuickPrivate Qt::Test ) diff --git a/tests/manual/pointer/CMakeLists.txt b/tests/manual/pointer/CMakeLists.txt index 49550f3c7e..c11611ed7e 100644 --- a/tests/manual/pointer/CMakeLists.txt +++ b/tests/manual/pointer/CMakeLists.txt @@ -9,12 +9,11 @@ qt_add_manual_test(pointer SOURCES inputinspector.cpp inputinspector.h main.cpp - LIBRARIES - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Gui Qt::Qml Qt::Quick + Qt::QuickPrivate Qt::Svg ) diff --git a/tests/manual/v4/auto/executableallocator/CMakeLists.txt b/tests/manual/v4/auto/executableallocator/CMakeLists.txt index c8a8c8d7ea..7001a270b6 100644 --- a/tests/manual/v4/auto/executableallocator/CMakeLists.txt +++ b/tests/manual/v4/auto/executableallocator/CMakeLists.txt @@ -7,11 +7,9 @@ qt_add_manual_test(tst_executableallocator SOURCES tst_executableallocator.cpp - LIBRARIES - v4Private PUBLIC_LIBRARIES Qt::Test - v4 + v4Private ) #### Keys ignored in scope 1:.:.:executableallocator.pro:<TRUE>: |