diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-05 11:39:32 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-05 14:36:38 +0000 |
commit | d15665b69323dd25ac075d60007d47dff3bc824b (patch) | |
tree | 35e195322e764399e55d6370e07a792c592e4fa1 /src | |
parent | 426585304e8e862dc2209a53a9c800838490154c (diff) |
Regenerate projects to handle private deps correctly
Change-Id: Ifcbab0407e93dfc35d0459d7d29dee2cd3508a86
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
47 files changed, 101 insertions, 185 deletions
diff --git a/src/imports/folderlistmodel/CMakeLists.txt b/src/imports/folderlistmodel/CMakeLists.txt index 56f953d6bc..cc2249c5d0 100644 --- a/src/imports/folderlistmodel/CMakeLists.txt +++ b/src/imports/folderlistmodel/CMakeLists.txt @@ -15,12 +15,9 @@ qt_add_qml_module(qmlfolderlistmodelplugin fileproperty_p.h plugin.cpp qquickfolderlistmodel.cpp qquickfolderlistmodel.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Qml ) #### Keys ignored in scope 1:.:.:folderlistmodel.pro:<TRUE>: diff --git a/src/imports/labsanimation/CMakeLists.txt b/src/imports/labsanimation/CMakeLists.txt index f9665cfb27..a8830231da 100644 --- a/src/imports/labsanimation/CMakeLists.txt +++ b/src/imports/labsanimation/CMakeLists.txt @@ -13,12 +13,9 @@ qt_add_qml_module(labsanimationplugin SOURCES plugin.cpp qquickboundaryrule.cpp qquickboundaryrule_p.h - LIBRARIES + PUBLIC_LIBRARIES Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:labsanimation.pro:<TRUE>: diff --git a/src/imports/labsmodels/CMakeLists.txt b/src/imports/labsmodels/CMakeLists.txt index 06c8a020d7..358bd5df18 100644 --- a/src/imports/labsmodels/CMakeLists.txt +++ b/src/imports/labsmodels/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_qml_module(labsmodelsplugin GENERATE_QMLTYPES SOURCES plugin.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::QmlModelsPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml - Qt::QmlModels ) #### Keys ignored in scope 1:.:.:labsmodels.pro:<TRUE>: diff --git a/src/imports/layouts/CMakeLists.txt b/src/imports/layouts/CMakeLists.txt index 43637d3d0b..f788bd3f5a 100644 --- a/src/imports/layouts/CMakeLists.txt +++ b/src/imports/layouts/CMakeLists.txt @@ -18,16 +18,13 @@ qt_add_qml_module(qquicklayoutsplugin qquicklayoutstyleinfo.cpp qquicklayoutstyleinfo_p.h qquicklinearlayout.cpp qquicklinearlayout_p.h qquickstacklayout.cpp qquickstacklayout_p.h - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:layouts.pro:<TRUE>: diff --git a/src/imports/localstorage/CMakeLists.txt b/src/imports/localstorage/CMakeLists.txt index cc980eb5e0..4727de7f93 100644 --- a/src/imports/localstorage/CMakeLists.txt +++ b/src/imports/localstorage/CMakeLists.txt @@ -13,12 +13,9 @@ qt_add_qml_module(qmllocalstorageplugin SOURCES plugin.cpp qquicklocalstorage.cpp qquicklocalstorage_p.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Qml Qt::Sql ) diff --git a/src/imports/models/CMakeLists.txt b/src/imports/models/CMakeLists.txt index 90abdaa743..0efe8eb479 100644 --- a/src/imports/models/CMakeLists.txt +++ b/src/imports/models/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_qml_module(modelsplugin SKIP_TYPE_REGISTRATION SOURCES plugin.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::QmlModelsPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml - Qt::QmlModels ) #### Keys ignored in scope 1:.:.:models.pro:<TRUE>: diff --git a/src/imports/particles/CMakeLists.txt b/src/imports/particles/CMakeLists.txt index d20d5eecba..8326575cdc 100644 --- a/src/imports/particles/CMakeLists.txt +++ b/src/imports/particles/CMakeLists.txt @@ -11,16 +11,12 @@ qt_add_qml_module(particlesplugin SKIP_TYPE_REGISTRATION SOURCES plugin.cpp - LIBRARIES - Qt::QmlPrivate - Qt::QuickParticlesPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickParticles + Qt::QmlPrivate + Qt::QuickParticlesPrivate + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:particles.pro:<TRUE>: diff --git a/src/imports/qtqml/.prev_CMakeLists.txt b/src/imports/qtqml/.prev_CMakeLists.txt index de771ce3d2..7db224aa44 100644 --- a/src/imports/qtqml/.prev_CMakeLists.txt +++ b/src/imports/qtqml/.prev_CMakeLists.txt @@ -23,12 +23,9 @@ qt_add_qml_module(qmlplugin IMPORTS ${module_dynamic_qml_imports} SOURCES plugin.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::QmlModelsPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Qml - Qt::QmlModels ) #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>: diff --git a/src/imports/qtqml/CMakeLists.txt b/src/imports/qtqml/CMakeLists.txt index 925f39e8b5..705d4c965b 100644 --- a/src/imports/qtqml/CMakeLists.txt +++ b/src/imports/qtqml/CMakeLists.txt @@ -23,13 +23,10 @@ qt_add_qml_module(qmlplugin IMPORTS ${module_dynamic_qml_imports} SOURCES plugin.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::QmlModelsPrivate Qt::QmlPrivate Qt::CorePrivate # special case - PUBLIC_LIBRARIES - Qt::Qml - Qt::QmlModels ) #### Keys ignored in scope 1:.:.:qtqml.pro:<TRUE>: diff --git a/src/imports/qtquick2/CMakeLists.txt b/src/imports/qtquick2/CMakeLists.txt index 2973edb02f..6b017885ae 100644 --- a/src/imports/qtquick2/CMakeLists.txt +++ b/src/imports/qtquick2/CMakeLists.txt @@ -14,16 +14,12 @@ qt_add_qml_module(qtquick2plugin QtQml SOURCES plugin.cpp - LIBRARIES - Qt::QmlModelsPrivate - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::Qml - Qt::QmlModels - Qt::Quick + Qt::QmlModelsPrivate + Qt::QmlPrivate + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:qtquick2.pro:<TRUE>: @@ -35,8 +31,6 @@ qt_add_qml_module(qtquick2plugin ##################################################################### qt_extend_target(qtquick2plugin CONDITION QT_FEATURE_qml_worker_script - LIBRARIES - Qt::QmlWorkerScriptPrivate PUBLIC_LIBRARIES - Qt::QmlWorkerScript + Qt::QmlWorkerScriptPrivate ) diff --git a/src/imports/shapes/CMakeLists.txt b/src/imports/shapes/CMakeLists.txt index 512b33ff73..c745ccd038 100644 --- a/src/imports/shapes/CMakeLists.txt +++ b/src/imports/shapes/CMakeLists.txt @@ -11,16 +11,12 @@ qt_add_qml_module(qmlshapesplugin SKIP_TYPE_REGISTRATION SOURCES plugin.cpp - LIBRARIES - Qt::GuiPrivate - Qt::QuickPrivate - Qt::QuickShapesPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::GuiPrivate Qt::Qml - Qt::Quick - Qt::QuickShapes + Qt::QuickPrivate + Qt::QuickShapesPrivate ) #### Keys ignored in scope 1:.:.:shapes.pro:<TRUE>: diff --git a/src/imports/sharedimage/CMakeLists.txt b/src/imports/sharedimage/CMakeLists.txt index 2a5f08af33..b6d61cf1e5 100644 --- a/src/imports/sharedimage/CMakeLists.txt +++ b/src/imports/sharedimage/CMakeLists.txt @@ -14,15 +14,13 @@ qt_add_qml_module(sharedimageplugin plugin.cpp qsharedimageloader.cpp qsharedimageloader_p.h sharedimageprovider.cpp sharedimageprovider.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Qml - Qt::Quick + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:sharedimage.pro:<TRUE>: diff --git a/src/imports/statemachine/CMakeLists.txt b/src/imports/statemachine/CMakeLists.txt index a20051d148..4e4b73cc7d 100644 --- a/src/imports/statemachine/CMakeLists.txt +++ b/src/imports/statemachine/CMakeLists.txt @@ -19,12 +19,9 @@ qt_add_qml_module(qtqmlstatemachine statemachine.cpp statemachine.h statemachineforeign.h timeouttransition.cpp timeouttransition.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Qml ) #### Keys ignored in scope 1:.:.:statemachine.pro:<TRUE>: diff --git a/src/imports/testlib/.prev_CMakeLists.txt b/src/imports/testlib/.prev_CMakeLists.txt index 864afa71d5..43c30c7f39 100644 --- a/src/imports/testlib/.prev_CMakeLists.txt +++ b/src/imports/testlib/.prev_CMakeLists.txt @@ -16,17 +16,14 @@ qt_add_qml_module(qmltestplugin quicktestevent.cpp quicktestevent_p.h quicktestresultforeign_p.h quicktestutil.cpp quicktestutil_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickTestPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui - Qt::Qml + Qt::GuiPrivate + Qt::QmlPrivate Qt::Quick - Qt::QuickTest + Qt::QuickTestPrivate Qt::Test ) diff --git a/src/imports/testlib/CMakeLists.txt b/src/imports/testlib/CMakeLists.txt index cdc3709dd9..18f1751d61 100644 --- a/src/imports/testlib/CMakeLists.txt +++ b/src/imports/testlib/CMakeLists.txt @@ -16,17 +16,14 @@ qt_add_qml_module(qmltestplugin quicktestevent.cpp quicktestevent_p.h quicktestresultforeign_p.h quicktestutil.cpp quicktestutil_p.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickTestPrivate PUBLIC_LIBRARIES Qt::Core + Qt::CorePrivate Qt::Gui - Qt::Qml + Qt::GuiPrivate + Qt::QmlPrivate Qt::Quick - Qt::QuickTest + Qt::QuickTestPrivate Qt::Test ) diff --git a/src/imports/wavefrontmesh/CMakeLists.txt b/src/imports/wavefrontmesh/CMakeLists.txt index 9cb11a590d..be083aede5 100644 --- a/src/imports/wavefrontmesh/CMakeLists.txt +++ b/src/imports/wavefrontmesh/CMakeLists.txt @@ -13,14 +13,10 @@ qt_add_qml_module(qmlwavefrontmeshplugin SOURCES plugin.cpp qwavefrontmesh.cpp qwavefrontmesh.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:wavefrontmesh.pro:<TRUE>: diff --git a/src/imports/window/CMakeLists.txt b/src/imports/window/CMakeLists.txt index 17e0496b2c..c300126bac 100644 --- a/src/imports/window/CMakeLists.txt +++ b/src/imports/window/CMakeLists.txt @@ -13,14 +13,11 @@ qt_add_qml_module(windowplugin GENERATE_QMLTYPES SOURCES plugin.cpp plugin.h - LIBRARIES - Qt::QmlPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui - Qt::Qml - Qt::Quick + Qt::QmlPrivate + Qt::QuickPrivate ) #### Keys ignored in scope 1:.:.:window.pro:<TRUE>: diff --git a/src/imports/workerscript/CMakeLists.txt b/src/imports/workerscript/CMakeLists.txt index b711cf4593..ac2b0fda7e 100644 --- a/src/imports/workerscript/CMakeLists.txt +++ b/src/imports/workerscript/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_qml_module(workerscriptplugin SKIP_TYPE_REGISTRATION SOURCES plugin.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::QmlPrivate Qt::QmlWorkerScriptPrivate - PUBLIC_LIBRARIES - Qt::Qml - Qt::QmlWorkerScript ) #### Keys ignored in scope 1:.:.:workerscript.pro:<TRUE>: diff --git a/src/particles/CMakeLists.txt b/src/particles/CMakeLists.txt index f6deceb5ae..37d5970971 100644 --- a/src/particles/CMakeLists.txt +++ b/src/particles/CMakeLists.txt @@ -41,16 +41,11 @@ qt_add_module(QuickParticles DEFINES QT_NO_INTEGER_EVENT_COORDINATES QT_NO_URL_CAST_FROM_STRING - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick ) # Resources: diff --git a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt index d12e30de7d..ddc2af6cfa 100644 --- a/src/plugins/qmltooling/packetprotocol/CMakeLists.txt +++ b/src/plugins/qmltooling/packetprotocol/CMakeLists.txt @@ -11,8 +11,6 @@ qt_add_module(PacketProtocol qpacket.cpp qpacket_p.h qpacketprotocol.cpp qpacketprotocol_p.h qversionedpacket_p.h - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate ) diff --git a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt index cc80b2c56d..7f42437e82 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_debugger/CMakeLists.txt @@ -16,14 +16,10 @@ qt_add_plugin(QQmlDebuggerServiceFactory qv4debuggeragent.cpp qv4debuggeragent.h qv4debugjob.cpp qv4debugjob.h qv4debugservice.cpp qv4debugservice.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::PacketProtocolPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::PacketProtocol - Qt::Qml ) #### Keys ignored in scope 1:.:.:qmldbg_debugger.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt index 648921fd8e..4e2b41c67b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_inspector/CMakeLists.txt @@ -14,18 +14,14 @@ qt_add_plugin(QQmlInspectorServiceFactory qqmlinspectorservice.cpp qqmlinspectorservicefactory.h qquickwindowinspector.cpp qquickwindowinspector.h - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::PacketProtocolPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::PacketProtocol - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:qmldbg_inspector.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt index ad285abba9..32cb329cc2 100644 --- a/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_local/CMakeLists.txt @@ -10,10 +10,8 @@ qt_add_plugin(QLocalClientConnectionFactory SOURCES qlocalclientconnection.cpp qlocalclientconnectionfactory.h - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES - Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qmldbg_local.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt index 980c158488..83bfbe1c37 100644 --- a/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_messages/CMakeLists.txt @@ -10,13 +10,10 @@ qt_add_plugin(QDebugMessageServiceFactory SOURCES qdebugmessageservice.cpp qdebugmessageservice.h qdebugmessageservicefactory.cpp qdebugmessageservicefactory.h - LIBRARIES - Qt::PacketProtocolPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::PacketProtocol - Qt::Qml + Qt::PacketProtocolPrivate + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qmldbg_messages.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt index ff92255720..844c35ae4b 100644 --- a/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_native/CMakeLists.txt @@ -9,14 +9,10 @@ qt_add_plugin(QQmlNativeDebugConnectorFactory TYPE qmltooling SOURCES qqmlnativedebugconnector.cpp qqmlnativedebugconnector.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::PacketProtocolPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::PacketProtocol - Qt::Qml ) #### Keys ignored in scope 1:.:.:qmldbg_native.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt index 6a7e23301f..62aa1399e0 100644 --- a/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_nativedebugger/CMakeLists.txt @@ -10,13 +10,10 @@ qt_add_plugin(QQmlNativeDebugServiceFactory SOURCES qqmlnativedebugservice.cpp qqmlnativedebugservice.h qqmlnativedebugservicefactory.cpp qqmlnativedebugservicefactory.h - LIBRARIES - Qt::PacketProtocolPrivate - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Core - Qt::PacketProtocol - Qt::Qml + Qt::PacketProtocolPrivate + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qmldbg_nativedebugger.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt index 17df4c0b2c..3ef787cad3 100644 --- a/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_preview/CMakeLists.txt @@ -15,19 +15,15 @@ qt_add_plugin(QQmlPreviewServiceFactory qqmlpreviewposition.cpp qqmlpreviewposition.h qqmlpreviewservice.cpp qqmlpreviewservice.h qqmlpreviewservicefactory.cpp qqmlpreviewservicefactory.h - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate + Qt::Gui Qt::GuiPrivate + Qt::Network Qt::PacketProtocolPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Network - Qt::PacketProtocol - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:qmldbg_preview.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt index 1809f3a0d1..b1ff256a1a 100644 --- a/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_profiler/CMakeLists.txt @@ -13,14 +13,10 @@ qt_add_plugin(QQmlProfilerServiceFactory qqmlprofilerservice.cpp qqmlprofilerservice.h qqmlprofilerservicefactory.cpp qqmlprofilerservicefactory.h qv4profileradapter.cpp qv4profileradapter.h - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::PacketProtocolPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::PacketProtocol - Qt::Qml ) #### Keys ignored in scope 1:.:.:qmldbg_profiler.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt index e5afbec3ed..e67deee569 100644 --- a/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_quickprofiler/CMakeLists.txt @@ -10,17 +10,13 @@ qt_add_plugin(QQuickProfilerAdapterFactory SOURCES qquickprofileradapter.cpp qquickprofileradapter.h qquickprofileradapterfactory.cpp qquickprofileradapterfactory.h - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate + Qt::Gui Qt::PacketProtocolPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::PacketProtocol - Qt::Qml - Qt::Quick ) #### Keys ignored in scope 1:.:.:qmldbg_quickprofiler.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt index c6e1ccd915..58a8b9506b 100644 --- a/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_server/CMakeLists.txt @@ -10,12 +10,9 @@ qt_add_plugin(QQmlDebugServerFactory SOURCES qqmldebugserver.cpp qqmldebugserverfactory.h - LIBRARIES + PUBLIC_LIBRARIES Qt::PacketProtocolPrivate Qt::QmlPrivate - PUBLIC_LIBRARIES - Qt::PacketProtocol - Qt::Qml ) #### Keys ignored in scope 1:.:.:qmldbg_server.pro:<TRUE>: diff --git a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt index fb8397d914..0c9afa852f 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt +++ b/src/plugins/qmltooling/qmldbg_tcp/CMakeLists.txt @@ -10,11 +10,9 @@ qt_add_plugin(QTcpServerConnectionFactory SOURCES qtcpserverconnection.cpp qtcpserverconnectionfactory.h - LIBRARIES - Qt::QmlPrivate PUBLIC_LIBRARIES Qt::Network - Qt::Qml + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qmldbg_tcp.pro:<TRUE>: diff --git a/src/plugins/scenegraph/openvg/CMakeLists.txt b/src/plugins/scenegraph/openvg/CMakeLists.txt index eb06ef075d..3acfa066f4 100644 --- a/src/plugins/scenegraph/openvg/CMakeLists.txt +++ b/src/plugins/scenegraph/openvg/CMakeLists.txt @@ -26,16 +26,13 @@ qt_add_plugin(QSGOpenVGAdaptation qsgopenvgrenderer.cpp qsgopenvgrenderer_p.h qsgopenvgrenderloop.cpp qsgopenvgrenderloop_p.h qsgopenvgtexture.cpp qsgopenvgtexture.h - LIBRARIES + PUBLIC_LIBRARIES + Qt::Core Qt::CorePrivate + Qt::Gui Qt::GuiPrivate Qt::QmlPrivate Qt::QuickPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick openvg ) diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt index fdb59c1ea4..a19926ab23 100644 --- a/src/qml/.prev_CMakeLists.txt +++ b/src/qml/.prev_CMakeLists.txt @@ -313,6 +313,8 @@ qt_add_module(Qml Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) # QLALR Grammars: diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt index b61850f610..5b2f8c46fc 100644 --- a/src/qml/CMakeLists.txt +++ b/src/qml/CMakeLists.txt @@ -313,6 +313,8 @@ qt_add_module(Qml Qt::CorePrivate PUBLIC_LIBRARIES Qt::Core + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) # special case begin remove the block, handled manually diff --git a/src/qmldebug/CMakeLists.txt b/src/qmldebug/CMakeLists.txt index 048293312f..e1502e02d1 100644 --- a/src/qmldebug/CMakeLists.txt +++ b/src/qmldebug/CMakeLists.txt @@ -30,11 +30,8 @@ qt_add_module(QmlDebug qqmlprofilertypedevent.cpp qqmlprofilertypedevent_p.h qv4debugclient.cpp qv4debugclient_p.h qv4debugclient_p_p.h - LIBRARIES - Qt::CorePrivate - Qt::PacketProtocolPrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate Qt::Network - Qt::PacketProtocol + Qt::PacketProtocolPrivate ) diff --git a/src/qmldevtools/.prev_CMakeLists.txt b/src/qmldevtools/.prev_CMakeLists.txt index 1497d1bf95..702fa3be59 100644 --- a/src/qmldevtools/.prev_CMakeLists.txt +++ b/src/qmldevtools/.prev_CMakeLists.txt @@ -44,10 +44,8 @@ qt_add_module(QmlDevTools ${CMAKE_CURRENT_BINARY_DIR}/../qml/qmldirparser ../qml/compiler ../qml/qmldirparser - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate ) # QLALR Grammars: diff --git a/src/qmldevtools/CMakeLists.txt b/src/qmldevtools/CMakeLists.txt index 846e511703..439b89dcec 100644 --- a/src/qmldevtools/CMakeLists.txt +++ b/src/qmldevtools/CMakeLists.txt @@ -44,10 +44,8 @@ qt_add_module(QmlDevTools ${CMAKE_CURRENT_BINARY_DIR}/../qml/qmldirparser ../qml/compiler ../qml/qmldirparser - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES - Qt::Core + Qt::CorePrivate ) # special case begin diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt index 7247812a29..9fe275077b 100644 --- a/src/qmlmodels/CMakeLists.txt +++ b/src/qmlmodels/CMakeLists.txt @@ -20,6 +20,9 @@ qt_add_module(QmlModels PUBLIC_LIBRARIES Qt::Core Qt::Qml + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qmlmodels.pro:<TRUE>: diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt index 288a5190a5..db3f568a7b 100644 --- a/src/qmltest/.prev_CMakeLists.txt +++ b/src/qmltest/.prev_CMakeLists.txt @@ -25,6 +25,8 @@ qt_add_module(QuickTest PUBLIC_LIBRARIES Qt::Core Qt::Test + PRIVATE_MODULE_INTERFACE + Qt::TestPrivate ) #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index 269e176394..4ad0d84928 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -26,6 +26,8 @@ qt_add_module(QuickTest PUBLIC_LIBRARIES Qt::Core Qt::Test + PRIVATE_MODULE_INTERFACE + Qt::TestPrivate ) #### Keys ignored in scope 1:.:.:qmltest.pro:<TRUE>: diff --git a/src/qmltyperegistrar/.prev_CMakeLists.txt b/src/qmltyperegistrar/.prev_CMakeLists.txt index b9683257bc..1d376d161f 100644 --- a/src/qmltyperegistrar/.prev_CMakeLists.txt +++ b/src/qmltyperegistrar/.prev_CMakeLists.txt @@ -16,7 +16,7 @@ qt_add_tool(qmltyperegistrar QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../../tools/shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/src/qmltyperegistrar/CMakeLists.txt b/src/qmltyperegistrar/CMakeLists.txt index 15721f5f1a..be3c28dc22 100644 --- a/src/qmltyperegistrar/CMakeLists.txt +++ b/src/qmltyperegistrar/CMakeLists.txt @@ -17,7 +17,7 @@ qt_add_tool(qmltyperegistrar QT_NO_CAST_TO_ASCII INCLUDE_DIRECTORIES ../../tools/shared - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/src/qmlworkerscript/.prev_CMakeLists.txt b/src/qmlworkerscript/.prev_CMakeLists.txt index 22fc4e4709..0599001034 100644 --- a/src/qmlworkerscript/.prev_CMakeLists.txt +++ b/src/qmlworkerscript/.prev_CMakeLists.txt @@ -43,6 +43,9 @@ qt_add_module(QmlWorkerScript PUBLIC_LIBRARIES Qt::Core Qt::Qml + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: diff --git a/src/qmlworkerscript/CMakeLists.txt b/src/qmlworkerscript/CMakeLists.txt index c7f7b60c7d..6d3a87ab10 100644 --- a/src/qmlworkerscript/CMakeLists.txt +++ b/src/qmlworkerscript/CMakeLists.txt @@ -43,6 +43,9 @@ qt_add_module(QmlWorkerScript PUBLIC_LIBRARIES Qt::Core Qt::Qml + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::QmlPrivate ) #### Keys ignored in scope 1:.:.:qmlworkerscript.pro:<TRUE>: diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index e1e8669886..c7c839fb49 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -183,6 +183,11 @@ qt_add_module(Quick Qt::Gui Qt::Qml Qt::QmlModels + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlModelsPrivate + Qt::QmlPrivate ) # Resources: @@ -415,6 +420,10 @@ qt_extend_target(Quick CONDITION QT_FEATURE_accessibility Qt::Core Qt::Gui Qt::Qml + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlPrivate ) qt_extend_target(Quick CONDITION QT_FEATURE_qml_debug diff --git a/src/quickshapes/CMakeLists.txt b/src/quickshapes/CMakeLists.txt index cba1695d3b..fae5b4dc88 100644 --- a/src/quickshapes/CMakeLists.txt +++ b/src/quickshapes/CMakeLists.txt @@ -13,14 +13,11 @@ qt_add_module(QuickShapes qquickshapegenericrenderer.cpp qquickshapegenericrenderer_p.h qquickshapesglobal.h qquickshapesglobal_p.h qquickshapesoftwarerenderer.cpp qquickshapesoftwarerenderer_p.h - LIBRARIES - Qt::GuiPrivate - Qt::QuickPrivate PUBLIC_LIBRARIES Qt::Core - Qt::Gui + Qt::GuiPrivate Qt::Qml - Qt::Quick + Qt::QuickPrivate ) # Resources: diff --git a/src/quickwidgets/CMakeLists.txt b/src/quickwidgets/CMakeLists.txt index 113e7cc71f..53a233e341 100644 --- a/src/quickwidgets/CMakeLists.txt +++ b/src/quickwidgets/CMakeLists.txt @@ -24,4 +24,10 @@ qt_add_module(QuickWidgets Qt::Qml Qt::Quick Qt::Widgets + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate + Qt::GuiPrivate + Qt::QmlPrivate + Qt::QuickPrivate + Qt::WidgetsPrivate ) |