Regenerate plugins bearer and imageformats projects

Change-Id: I8858aaf6b96ea030a3af143099aee5dfd15655c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

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()

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()

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

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"

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"

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"

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:

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"

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()

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"

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"

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"

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"

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"

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"