diff options
Diffstat (limited to 'tests/auto/quick')
77 files changed, 174 insertions, 401 deletions
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} ) |