summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-17 10:02:48 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-17 16:56:23 +0000
commit4df389eb4f1ae10284c03023e923ce2164d46753 (patch)
tree0bf380793f86b06cc92c3dcb12d858e199c7cd7d /src/plugins/bearer
parent02164e0288f714f1ea93afb32548548686773d1d (diff)
Re-generate affected cmake files and configure.json after the merge
This also removes the workarounds of commit b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream" in the .pro files. Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r--src/plugins/bearer/android/src/CMakeLists.txt2
-rw-r--r--src/plugins/bearer/connman/.prev_CMakeLists.txt25
-rw-r--r--src/plugins/bearer/connman/CMakeLists.txt3
-rw-r--r--src/plugins/bearer/corewlan/CMakeLists.txt2
-rw-r--r--src/plugins/bearer/generic/CMakeLists.txt2
-rw-r--r--src/plugins/bearer/networkmanager/.prev_CMakeLists.txt25
-rw-r--r--src/plugins/bearer/networkmanager/CMakeLists.txt3
7 files changed, 50 insertions, 12 deletions
diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt
index f887f92685..95f8f1fd65 100644
--- a/src/plugins/bearer/android/src/CMakeLists.txt
+++ b/src/plugins/bearer/android/src/CMakeLists.txt
@@ -8,8 +8,6 @@ add_qt_plugin(qandroidbearer
TYPE bearer
CLASS_NAME QAndroidBearerEnginePlugin
SOURCES
- ../../qbearerengine_impl.h
- ../../qnetworksession_impl.cpp ../../qnetworksession_impl.h
main.cpp
qandroidbearerengine.cpp qandroidbearerengine.h
wrappers/androidconnectivitymanager.cpp wrappers/androidconnectivitymanager.h
diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..ff368dd693
--- /dev/null
+++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from connman.pro.
+
+#####################################################################
+## qconnmanbearer Plugin:
+#####################################################################
+
+add_qt_plugin(qconnmanbearer
+ TYPE bearer
+ CLASS_NAME QConnmanEnginePlugin
+ SOURCES
+ ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
+ main.cpp
+ qconnmanengine.cpp qconnmanengine.h
+ qconnmanservice_linux.cpp qconnmanservice_linux_p.h
+ LIBRARIES
+ Qt::NetworkPrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::DBus
+ Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:connman.pro:<TRUE>:
+# OTHER_FILES = "connman.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt
index cadd67bbce..ff368dd693 100644
--- a/src/plugins/bearer/connman/CMakeLists.txt
+++ b/src/plugins/bearer/connman/CMakeLists.txt
@@ -6,12 +6,9 @@
add_qt_plugin(qconnmanbearer
TYPE bearer
- DEFAULT_IF False # special case QTBUG-78164
CLASS_NAME QConnmanEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
- ../qbearerengine_impl.h
- ../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qconnmanengine.cpp qconnmanengine.h
qconnmanservice_linux.cpp qconnmanservice_linux_p.h
diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt
index 0870e01962..8323d9885a 100644
--- a/src/plugins/bearer/corewlan/CMakeLists.txt
+++ b/src/plugins/bearer/corewlan/CMakeLists.txt
@@ -8,8 +8,6 @@ add_qt_plugin(qcorewlanbearer
TYPE bearer
CLASS_NAME QCoreWlanEnginePlugin
SOURCES
- ../qbearerengine_impl.h
- ../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qcorewlanengine.h qcorewlanengine.mm
LIBRARIES
diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt
index e793284d9e..990a6f6743 100644
--- a/src/plugins/bearer/generic/CMakeLists.txt
+++ b/src/plugins/bearer/generic/CMakeLists.txt
@@ -9,8 +9,6 @@ add_qt_plugin(qgenericbearer
CLASS_NAME QGenericEnginePlugin
SOURCES
../platformdefs_win.h
- ../qbearerengine_impl.h
- ../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qgenericengine.cpp qgenericengine.h
LIBRARIES
diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..171250233e
--- /dev/null
+++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
@@ -0,0 +1,25 @@
+# Generated from networkmanager.pro.
+
+#####################################################################
+## qnmbearer Plugin:
+#####################################################################
+
+add_qt_plugin(qnmbearer
+ TYPE bearer
+ CLASS_NAME QNetworkManagerEnginePlugin
+ SOURCES
+ ../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
+ main.cpp
+ qnetworkmanagerengine.cpp qnetworkmanagerengine.h
+ qnetworkmanagerservice.cpp qnetworkmanagerservice.h
+ LIBRARIES
+ Qt::NetworkPrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::DBus
+ Qt::Network
+)
+
+#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>:
+# OTHER_FILES = "networkmanager.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt
index 245a18b64d..171250233e 100644
--- a/src/plugins/bearer/networkmanager/CMakeLists.txt
+++ b/src/plugins/bearer/networkmanager/CMakeLists.txt
@@ -6,12 +6,9 @@
add_qt_plugin(qnmbearer
TYPE bearer
- DEFAULT_IF False # special case QTBUG-78164
CLASS_NAME QNetworkManagerEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
- ../qbearerengine_impl.h
- ../qnetworksession_impl.cpp ../qnetworksession_impl.h
main.cpp
qnetworkmanagerengine.cpp qnetworkmanagerengine.h
qnetworkmanagerservice.cpp qnetworkmanagerservice.h