summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/CMakeLists.txt23
-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
-rw-r--r--src/plugins/imageformats/CMakeLists.txt3
-rw-r--r--src/plugins/imageformats/gif/.prev_CMakeLists.txt20
-rw-r--r--src/plugins/imageformats/gif/CMakeLists.txt1
-rw-r--r--src/plugins/imageformats/ico/.prev_CMakeLists.txt22
-rw-r--r--src/plugins/imageformats/ico/CMakeLists.txt11
-rw-r--r--src/plugins/imageformats/jpeg/.prev_CMakeLists.txt24
-rw-r--r--src/plugins/imageformats/jpeg/CMakeLists.txt9
15 files changed, 120 insertions, 37 deletions
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 6b69c5463d..6718d64ca0 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -1,32 +1,25 @@
# Generated from plugins.pro.
-
if(TARGET Qt::Sql)
add_subdirectory(sqldrivers)
endif()
-
-if(TARGET Qt::Network AND QT_FEATURE_bearermanagement)
+if(QT_FEATURE_bearermanagement AND TARGET Qt::Network)
add_subdirectory(bearer)
endif()
-
if(TARGET Qt::Gui)
add_subdirectory(platforms)
add_subdirectory(platforminputcontexts)
add_subdirectory(platformthemes)
-
- if(QT_FEATURE_imageformatplugin)
- add_subdirectory(imageformats)
- endif()
-
- if(NOT ANDROID AND QT_FEATURE_library)
- add_subdirectory(generic)
- endif()
endif()
-
+if(QT_FEATURE_imageformatplugin AND TARGET Qt::Gui)
+ add_subdirectory(imageformats)
+endif()
+if(QT_FEATURE_library AND TARGET Qt::Gui AND NOT ANDROID)
+ add_subdirectory(generic)
+endif()
if(TARGET Qt::Widgets)
add_subdirectory(styles)
endif()
-
-if(NOT WINRT AND TARGET Qt::PrintSupport)
+if(TARGET Qt::PrintSupport AND NOT WINRT)
add_subdirectory(printsupport)
endif()
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"
diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
index 9b39538e7c..00fefbdc0d 100644
--- a/src/plugins/imageformats/CMakeLists.txt
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -1,14 +1,11 @@
# Generated from imageformats.pro.
-
if(QT_FEATURE_ico)
add_subdirectory(ico)
endif()
-
if(QT_FEATURE_jpeg)
add_subdirectory(jpeg)
endif()
-
if(QT_FEATURE_gif)
add_subdirectory(gif)
endif()
diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c4add000b2
--- /dev/null
+++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from gif.pro.
+
+#####################################################################
+## qgif Plugin:
+#####################################################################
+
+add_qt_plugin(qgif
+ TYPE imageformats
+ CLASS_NAME QGifPlugin
+ SOURCES
+ main.cpp main.h
+ qgifhandler.cpp qgifhandler_p.h
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>:
+# OTHER_FILES = "gif.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt
index be23fd4f32..f9d90c6825 100644
--- a/src/plugins/imageformats/gif/CMakeLists.txt
+++ b/src/plugins/imageformats/gif/CMakeLists.txt
@@ -18,5 +18,4 @@ add_qt_plugin(qgif
#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>:
# OTHER_FILES = "gif.json"
-# PLUGIN_CLASS_NAME = "QGifPlugin"
# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/ico/.prev_CMakeLists.txt b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d054bd9936
--- /dev/null
+++ b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from ico.pro.
+
+#####################################################################
+## qico Plugin:
+#####################################################################
+
+add_qt_plugin(qico
+ TYPE imageformats
+ CLASS_NAME QICOPlugin
+ SOURCES
+ main.cpp main.h
+ qicohandler.cpp qicohandler.h
+ LIBRARIES
+ Qt::CorePrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:ico.pro:<TRUE>:
+# OTHER_FILES = "ico.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
index 976ab98266..d054bd9936 100644
--- a/src/plugins/imageformats/ico/CMakeLists.txt
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -6,18 +6,17 @@
add_qt_plugin(qico
TYPE imageformats
+ CLASS_NAME QICOPlugin
SOURCES
main.cpp main.h
qicohandler.cpp qicohandler.h
LIBRARIES
- Qt::GuiPrivate # special case
- PUBLIC_LIBRARIES # special case
- Qt::Gui # special case
- CLASS_NAME
- QICOPlugin
+ Qt::CorePrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
)
#### Keys ignored in scope 1:.:.:ico.pro:<TRUE>:
# OTHER_FILES = "ico.json"
-# PLUGIN_CLASS_NAME = "QICOPlugin"
# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5d2f2d9a63
--- /dev/null
+++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from jpeg.pro.
+
+#####################################################################
+## qjpeg Plugin:
+#####################################################################
+
+add_qt_plugin(qjpeg
+ TYPE imageformats
+ CLASS_NAME QJpegPlugin
+ SOURCES
+ main.cpp main.h
+ qjpeghandler.cpp qjpeghandler_p.h
+ LIBRARIES
+ Qt::CorePrivate
+ Qt::GuiPrivate
+ PUBLIC_LIBRARIES
+ JPEG::JPEG
+ Qt::Core
+ Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
+# OTHER_FILES = "jpeg.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index 6d1da65d93..065ac08af6 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -13,15 +13,14 @@ add_qt_plugin(qjpeg
main.cpp main.h
qjpeghandler.cpp qjpeghandler_p.h
LIBRARIES
- # Qt::CorePrivate # special case: remove
+ Qt::CorePrivate
Qt::GuiPrivate
- PUBLIC_LIBRARIES # special case
+ PUBLIC_LIBRARIES
JPEG::JPEG
- # Qt::Core # special case: remove
- Qt::Gui # special case
+ Qt::Core
+ Qt::Gui
)
#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
# OTHER_FILES = "jpeg.json"
-# PLUGIN_CLASS_NAME = "QJpegPlugin"
# _LOADED = "qt_plugin"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 13:50:22 +0000