Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"

5 files changed, 8 insertions, 23 deletions

diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt
index d3471f4e63..5be89e316b 100644
--- a/src/plugins/bearer/android/src/CMakeLists.txt
+++ b/src/plugins/bearer/android/src/CMakeLists.txt
@@ -13,10 +13,7 @@ qt_add_plugin(QAndroidBearerEnginePlugin
         wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h
     INCLUDE_DIRECTORIES
         wrappers
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::NetworkPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Network
 )
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt
index 6e5f34f6a4..745f48b6e0 100644
--- a/src/plugins/bearer/connman/CMakeLists.txt
+++ b/src/plugins/bearer/connman/CMakeLists.txt
@@ -11,14 +11,11 @@ qt_add_plugin(QConnmanEnginePlugin
         main.cpp
         qconnmanengine.cpp qconnmanengine.h
         qconnmanservice_linux.cpp qconnmanservice_linux_p.h
-    LIBRARIES
-        Qt::LinuxOfonoSupportPrivate
-        Qt::NetworkPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::DBus
-        Qt::LinuxOfonoSupport
-        Qt::Network
+        Qt::LinuxOfonoSupportPrivate
+        Qt::NetworkPrivate
 )
 
 #### Keys ignored in scope 1:.:.:connman.pro:<TRUE>:
diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt
index eda3b85499..31e70cc938 100644
--- a/src/plugins/bearer/corewlan/CMakeLists.txt
+++ b/src/plugins/bearer/corewlan/CMakeLists.txt
@@ -10,14 +10,11 @@ qt_add_plugin(QCoreWlanEnginePlugin
     SOURCES
         main.cpp
         qcorewlanengine.h qcorewlanengine.mm
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::NetworkPrivate
     PUBLIC_LIBRARIES
         ${FWFoundation}
         ${FWSystemConfiguration}
-        Qt::Core
-        Qt::Network
+        Qt::CorePrivate
+        Qt::NetworkPrivate
 )
 
 #### Keys ignored in scope 1:.:.:corewlan.pro:<TRUE>:
diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt
index 0717b83dd3..6d65346b57 100644
--- a/src/plugins/bearer/generic/CMakeLists.txt
+++ b/src/plugins/bearer/generic/CMakeLists.txt
@@ -11,12 +11,9 @@ qt_add_plugin(QGenericEnginePlugin
         ../platformdefs_win.h
         main.cpp
         qgenericengine.cpp qgenericengine.h
-    LIBRARIES
+    PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::NetworkPrivate
-    PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Network
 )
 
 #### Keys ignored in scope 1:.:.:generic.pro:<TRUE>:
diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt
index 9c9721cca7..8f26a4c86d 100644
--- a/src/plugins/bearer/networkmanager/CMakeLists.txt
+++ b/src/plugins/bearer/networkmanager/CMakeLists.txt
@@ -11,14 +11,11 @@ qt_add_plugin(QNetworkManagerEnginePlugin
         main.cpp
         qnetworkmanagerengine.cpp qnetworkmanagerengine.h
         qnetworkmanagerservice.cpp qnetworkmanagerservice.h
-    LIBRARIES
-        Qt::LinuxOfonoSupportPrivate
-        Qt::NetworkPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::DBus
-        Qt::LinuxOfonoSupport
-        Qt::Network
+        Qt::LinuxOfonoSupportPrivate
+        Qt::NetworkPrivate
 )
 
 #### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>: