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>

13 files changed, 24 insertions, 66 deletions

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
 )