summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2019-05-06 15:02:40 +0200
committerTobias Hunger <tobias.hunger@qt.io>2019-05-06 14:46:11 +0000
commit0434b7fb38c33b26700daabe31a29ab0cd4294d7 (patch)
tree50a328ee258ed7da5e0734a47219bc941f100815
parent9ffcc761887f0088ae6226098723818843f0d287 (diff)
CMake: Regenerate src/plugins/bearer
Change-Id: I6c900247eb03b8afc3f299b5dbca5bac64527a52 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--src/plugins/bearer/CMakeLists.txt10
-rw-r--r--src/plugins/bearer/connman/CMakeLists.txt6
-rw-r--r--src/plugins/bearer/generic/CMakeLists.txt7
-rw-r--r--src/plugins/bearer/networkmanager/CMakeLists.txt6
4 files changed, 19 insertions, 10 deletions
diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt
index ec860de2cb..88e4f4206e 100644
--- a/src/plugins/bearer/CMakeLists.txt
+++ b/src/plugins/bearer/CMakeLists.txt
@@ -1,9 +1,11 @@
-if (NOT ANDROID AND LINUX AND QT_FEATURE_dbus)
+# Generated from bearer.pro.
+
+if(NOT ANDROID AND LINUX AND TARGET Qt::DBus) # special case
add_subdirectory(generic)
add_subdirectory(connman)
add_subdirectory(networkmanager)
-elseif(ANDROID AND NOT ANDROID_EMBEDDED)
-# TODO add_subdirectory(android)
-else()
+else if(ANDROID AND NOT ANDROID_EMBEDDED) # special case
+ add_subdirectory(android)
+else() # special case
add_subdirectory(generic)
endif()
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt
index 08f286aee1..c7cfa6efda 100644
--- a/src/plugins/bearer/connman/CMakeLists.txt
+++ b/src/plugins/bearer/connman/CMakeLists.txt
@@ -14,12 +14,14 @@ add_qt_plugin(qconnmanbearer
qconnmanengine.cpp qconnmanengine.h
qconnmanservice_linux.cpp qconnmanservice_linux_p.h
LIBRARIES
+ Qt::NetworkPrivate
+ PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
- Qt::NetworkPrivate
+ Qt::Network
)
-#### Keys ignored in scope 1:.:connman.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>:
# OTHER_FILES = "connman.json"
# PLUGIN_CLASS_NAME = "QConnmanEnginePlugin"
# _LOADED = "qt_plugin"
diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt
index 822cd12b19..f68b34a99b 100644
--- a/src/plugins/bearer/generic/CMakeLists.txt
+++ b/src/plugins/bearer/generic/CMakeLists.txt
@@ -15,9 +15,12 @@ add_qt_plugin(qgenericbearer
LIBRARIES
Qt::CorePrivate
Qt::NetworkPrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Network
)
-#### Keys ignored in scope 1:.:generic.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:generic.pro:<TRUE>:
# OTHER_FILES = "generic.json"
# PLUGIN_CLASS_NAME = "QGenericEnginePlugin"
# _LOADED = "qt_plugin"
@@ -26,6 +29,6 @@ add_qt_plugin(qgenericbearer
#####################################################################
extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT
- LIBRARIES
+ PUBLIC_LIBRARIES
iphlpapi
)
diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt
index 62c0b2a98b..998f06e47a 100644
--- a/src/plugins/bearer/networkmanager/CMakeLists.txt
+++ b/src/plugins/bearer/networkmanager/CMakeLists.txt
@@ -14,12 +14,14 @@ add_qt_plugin(qnmbearer
qnetworkmanagerengine.cpp qnetworkmanagerengine.h
qnetworkmanagerservice.cpp qnetworkmanagerservice.h
LIBRARIES
+ Qt::NetworkPrivate
+ PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
- Qt::NetworkPrivate
+ Qt::Network
)
-#### Keys ignored in scope 1:.:networkmanager.pro:<NONE>:
+#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>:
# OTHER_FILES = "networkmanager.json"
# PLUGIN_CLASS_NAME = "QNetworkManagerEnginePlugin"
# _LOADED = "qt_plugin"