diff options
Diffstat (limited to 'tests/auto/qml')
127 files changed, 315 insertions, 550 deletions
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: |