summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-07 17:45:35 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-08 13:10:01 +0000
commit115a76297b3c9f94b5258b42270228f06c96a575 (patch)
tree24806a9de32481334936c7ab9661f9c5408822b3 /src/plugins/bearer
parent9ff225b0e0fdd6472bcfee0b4d810239940dea42 (diff)
Regenerate plugins bearer and imageformats projects
Change-Id: I8858aaf6b96ea030a3af143099aee5dfd15655c8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r--src/plugins/bearer/.prev_CMakeLists.txt12
-rw-r--r--src/plugins/bearer/CMakeLists.txt9
-rw-r--r--src/plugins/bearer/android/jar/.prev_CMakeLists.txt18
-rw-r--r--src/plugins/bearer/android/src/CMakeLists.txt2
-rw-r--r--src/plugins/bearer/connman/CMakeLists.txt1
-rw-r--r--src/plugins/bearer/generic/CMakeLists.txt1
-rw-r--r--src/plugins/bearer/networkmanager/CMakeLists.txt1
7 files changed, 37 insertions, 7 deletions
diff --git a/src/plugins/bearer/.prev_CMakeLists.txt b/src/plugins/bearer/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..a7a36f60c6
--- /dev/null
+++ b/src/plugins/bearer/.prev_CMakeLists.txt
@@ -0,0 +1,12 @@
+# Generated from bearer.pro.
+
+if(SUBDIRS_ISEMPTY OR (TARGET Qt::DBus AND linux_x_ AND NOT ANDROID))
+ add_subdirectory(generic)
+endif()
+if(TARGET Qt::DBus AND linux_x_ AND NOT ANDROID)
+ add_subdirectory(connman)
+ add_subdirectory(networkmanager)
+endif()
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+ add_subdirectory(android)
+endif()
diff --git a/src/plugins/bearer/CMakeLists.txt b/src/plugins/bearer/CMakeLists.txt
index c5218959d6..528061d264 100644
--- a/src/plugins/bearer/CMakeLists.txt
+++ b/src/plugins/bearer/CMakeLists.txt
@@ -1,11 +1,14 @@
# Generated from bearer.pro.
-if(NOT ANDROID AND LINUX AND TARGET Qt::DBus) # special case
+# special case begin
+# The whole block is manual.
+if(NOT ANDROID AND LINUX AND TARGET Qt::DBus)
add_subdirectory(generic)
add_subdirectory(connman)
add_subdirectory(networkmanager)
-elseif(ANDROID AND NOT ANDROID_EMBEDDED) # special case
+elseif(ANDROID AND NOT ANDROID_EMBEDDED)
add_subdirectory(android)
-else() # special case
+else()
add_subdirectory(generic)
endif()
+# special case end
diff --git a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d7f5c86488
--- /dev/null
+++ b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from jar.pro.
+
+#####################################################################
+## QtAndroidBearer Binary:
+#####################################################################
+
+add_qt_executable(QtAndroidBearer
+ GUI
+ INSTALL_DIRECTORY "${INSTALL_DIRECTORY}/jar"
+ OUTPUT_DIRECTORY "$$MODULE_BASE_OUTDIR/jar"
+ PUBLIC_LIBRARIES
+ Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:jar.pro:<TRUE>:
+# JAVACLASSPATH = "$$PWD/src"
+# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java"
+# _LOADED = "qt_build_paths"
diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt
index 260e908170..f887f92685 100644
--- a/src/plugins/bearer/android/src/CMakeLists.txt
+++ b/src/plugins/bearer/android/src/CMakeLists.txt
@@ -6,6 +6,7 @@
add_qt_plugin(qandroidbearer
TYPE bearer
+ CLASS_NAME QAndroidBearerEnginePlugin
SOURCES
../../qbearerengine_impl.h
../../qnetworksession_impl.cpp ../../qnetworksession_impl.h
@@ -23,5 +24,4 @@ add_qt_plugin(qandroidbearer
)
#### Keys ignored in scope 1:.:.:src.pro:<TRUE>:
-# PLUGIN_CLASS_NAME = "QAndroidBearerEnginePlugin"
# _LOADED = "qt_plugin"
diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt
index a449ac8555..00f0c7dccb 100644
--- a/src/plugins/bearer/connman/CMakeLists.txt
+++ b/src/plugins/bearer/connman/CMakeLists.txt
@@ -24,5 +24,4 @@ add_qt_plugin(qconnmanbearer
#### 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 54e9ca62f3..e793284d9e 100644
--- a/src/plugins/bearer/generic/CMakeLists.txt
+++ b/src/plugins/bearer/generic/CMakeLists.txt
@@ -23,7 +23,6 @@ add_qt_plugin(qgenericbearer
#### Keys ignored in scope 1:.:.:generic.pro:<TRUE>:
# OTHER_FILES = "generic.json"
-# PLUGIN_CLASS_NAME = "QGenericEnginePlugin"
# _LOADED = "qt_plugin"
## Scopes:
diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt
index 19ec4767e7..c615aec243 100644
--- a/src/plugins/bearer/networkmanager/CMakeLists.txt
+++ b/src/plugins/bearer/networkmanager/CMakeLists.txt
@@ -24,5 +24,4 @@ add_qt_plugin(qnmbearer
#### Keys ignored in scope 1:.:.:networkmanager.pro:<TRUE>:
# OTHER_FILES = "networkmanager.json"
-# PLUGIN_CLASS_NAME = "QNetworkManagerEnginePlugin"
# _LOADED = "qt_plugin"