Regenerate qtimageformats

Ends up adding plugin class names and types.

Change-Id: I3824a3a00cf6f56442a0494effcf641e22b3dcc7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

18 files changed, 57 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8974e6b..e436fa0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,4 @@
 # Generated from src.pro.
 
+add_subdirectory(imageformats)
 add_subdirectory(plugins)
diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt
new file mode 100644
index 0000000..989075a
--- /dev/null
+++ b/src/imageformats/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Generated from imageformats.pro.
+
diff --git a/src/plugins/imageformats/icns/.prev_CMakeLists.txt b/src/plugins/imageformats/icns/.prev_CMakeLists.txt
index e3e4962..e85c4b5 100644
--- a/src/plugins/imageformats/icns/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/icns/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qicns
     TYPE imageformats
+    CLASS_NAME QICNSPlugin
     SOURCES
         main.cpp
         qicnshandler.cpp qicnshandler_p.h
@@ -17,4 +18,5 @@ add_qt_plugin(qicns
 #### Keys ignored in scope 1:.:.:icns.pro:<TRUE>:
 # OTHER_FILES = "icns.json"
 # PLUGIN_CLASS_NAME = "QICNSPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/icns/CMakeLists.txt b/src/plugins/imageformats/icns/CMakeLists.txt
index 55f07f2..99a7643 100644
--- a/src/plugins/imageformats/icns/CMakeLists.txt
+++ b/src/plugins/imageformats/icns/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qicns
     TYPE imageformats
+    CLASS_NAME QICNSPlugin
     SOURCES
         main.cpp
         qicnshandler.cpp qicnshandler_p.h
@@ -19,4 +20,5 @@ add_qt_plugin(qicns
 #### Keys ignored in scope 1:.:.:icns.pro:<TRUE>:
 # OTHER_FILES = "icns.json"
 # PLUGIN_CLASS_NAME = "QICNSPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/jp2/.prev_CMakeLists.txt b/src/plugins/imageformats/jp2/.prev_CMakeLists.txt
new file mode 100644
index 0000000..7ed0594
--- /dev/null
+++ b/src/plugins/imageformats/jp2/.prev_CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from jp2.pro.
+
+#####################################################################
+## qjp2 Plugin:
+#####################################################################
+
+add_qt_plugin(qjp2
+    TYPE imageformats
+    CLASS_NAME QJp2Plugin
+    SOURCES
+        main.cpp
+        qjp2handler.cpp qjp2handler_p.h
+    LIBRARIES
+        WrapJasper::WrapJasper
+)
+
+#### Keys ignored in scope 1:.:.:jp2.pro:<TRUE>:
+# OTHER_FILES = "jp2.json"
+# PLUGIN_CLASS_NAME = "QJp2Plugin"
+# PLUGIN_TYPE = "imageformats"
+# QT_FOR_CONFIG = "imageformats-private"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/jp2/CMakeLists.txt b/src/plugins/imageformats/jp2/CMakeLists.txt
index a4594e4..5e7fd3b 100644
--- a/src/plugins/imageformats/jp2/CMakeLists.txt
+++ b/src/plugins/imageformats/jp2/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qjp2
     TYPE imageformats
+    CLASS_NAME QJp2Plugin
     SOURCES
         main.cpp
         qjp2handler.cpp qjp2handler_p.h
@@ -17,5 +18,6 @@ add_qt_plugin(qjp2
 #### Keys ignored in scope 1:.:.:jp2.pro:<TRUE>:
 # OTHER_FILES = "jp2.json"
 # PLUGIN_CLASS_NAME = "QJp2Plugin"
+# PLUGIN_TYPE = "imageformats"
 # QT_FOR_CONFIG = "imageformats-private"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
index 5d1b0b7..27a8682 100644
--- a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qmacheif
     TYPE imageformats
+    CLASS_NAME QMacHeifPlugin
     SOURCES
         ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h
         main.cpp
@@ -26,4 +27,5 @@ add_qt_plugin(qmacheif
 #### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>:
 # OTHER_FILES = "macheif.json"
 # PLUGIN_CLASS_NAME = "QMacHeifPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/macheif/CMakeLists.txt b/src/plugins/imageformats/macheif/CMakeLists.txt
index 7043c73..82950cb 100644
--- a/src/plugins/imageformats/macheif/CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/CMakeLists.txt
@@ -12,6 +12,7 @@ find_library(FWImageIO ImageIO)
 
 add_qt_plugin(qmacheif
     TYPE imageformats
+    CLASS_NAME QMacHeifPlugin
     SOURCES
         ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h
         main.cpp
@@ -32,4 +33,5 @@ add_qt_plugin(qmacheif
 #### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>:
 # OTHER_FILES = "macheif.json"
 # PLUGIN_CLASS_NAME = "QMacHeifPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/macjp2/CMakeLists.txt b/src/plugins/imageformats/macjp2/CMakeLists.txt
index ec4c739..058e437 100644
--- a/src/plugins/imageformats/macjp2/CMakeLists.txt
+++ b/src/plugins/imageformats/macjp2/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qmacjp2
     TYPE imageformats
+    CLASS_NAME QMacJp2Plugin
     SOURCES
         ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h
         main.cpp
@@ -26,4 +27,5 @@ add_qt_plugin(qmacjp2
 #### Keys ignored in scope 1:.:.:macjp2.pro:<TRUE>:
 # OTHER_FILES = "macjp2.json"
 # PLUGIN_CLASS_NAME = "QMacJp2Plugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/mng/CMakeLists.txt b/src/plugins/imageformats/mng/CMakeLists.txt
index dfd28ac..4d12a68 100644
--- a/src/plugins/imageformats/mng/CMakeLists.txt
+++ b/src/plugins/imageformats/mng/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qmng
     TYPE imageformats
+    CLASS_NAME QMngPlugin
     SOURCES
         main.cpp
         qmnghandler.cpp qmnghandler_p.h
@@ -14,6 +15,7 @@ add_qt_plugin(qmng
 #### Keys ignored in scope 1:.:.:mng.pro:<TRUE>:
 # OTHER_FILES = "mng.json"
 # PLUGIN_CLASS_NAME = "QMngPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
diff --git a/src/plugins/imageformats/tga/.prev_CMakeLists.txt b/src/plugins/imageformats/tga/.prev_CMakeLists.txt
index a78ed83..6f81410 100644
--- a/src/plugins/imageformats/tga/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tga/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qtga
     TYPE imageformats
+    CLASS_NAME QTgaPlugin
     SOURCES
         main.cpp
         qtgafile.cpp qtgafile.h
@@ -15,4 +16,5 @@ add_qt_plugin(qtga
 #### Keys ignored in scope 1:.:.:tga.pro:<TRUE>:
 # OTHER_FILES = "tga.json"
 # PLUGIN_CLASS_NAME = "QTgaPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tga/CMakeLists.txt b/src/plugins/imageformats/tga/CMakeLists.txt
index 03b8e20..afd53f1 100644
--- a/src/plugins/imageformats/tga/CMakeLists.txt
+++ b/src/plugins/imageformats/tga/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qtga
     TYPE imageformats
+    CLASS_NAME QTgaPlugin
     SOURCES
         main.cpp
         qtgafile.cpp qtgafile.h
@@ -18,4 +19,5 @@ add_qt_plugin(qtga
 #### Keys ignored in scope 1:.:.:tga.pro:<TRUE>:
 # OTHER_FILES = "tga.json"
 # PLUGIN_CLASS_NAME = "QTgaPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
index e49352d..5621f04 100644
--- a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qtiff
     TYPE imageformats
+    CLASS_NAME QTiffPlugin
     SOURCES
         main.cpp
         qtiffhandler.cpp qtiffhandler_p.h
@@ -14,6 +15,7 @@ add_qt_plugin(qtiff
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
 # PLUGIN_CLASS_NAME = "QTiffPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
@@ -67,6 +69,8 @@ extend_target(qtiff CONDITION NOT config_libtiff
         ../../../3rdparty/libtiff/port/snprintf.c
     INCLUDE_DIRECTORIES
         ../../../3rdparty/libtiff/libtiff
+    LIBRARIES
+        ZLIB::ZLIB
 )
 
 extend_target(qtiff CONDITION WIN32 AND NOT config_libtiff
diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt
index d831693..7673ec6 100644
--- a/src/plugins/imageformats/tiff/CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/CMakeLists.txt
@@ -17,6 +17,7 @@ endif()
 
 add_qt_plugin(qtiff
     TYPE imageformats
+    CLASS_NAME QTiffPlugin
     SOURCES
         main.cpp
         qtiffhandler.cpp qtiffhandler_p.h
@@ -30,6 +31,7 @@ add_qt_plugin(qtiff
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
 # PLUGIN_CLASS_NAME = "QTiffPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
diff --git a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt b/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
index 925cdec..fb3982c 100644
--- a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qwbmp
     TYPE imageformats
+    CLASS_NAME QWbmpPlugin
     SOURCES
         main.cpp
         qwbmphandler.cpp qwbmphandler_p.h
@@ -14,4 +15,5 @@ add_qt_plugin(qwbmp
 #### Keys ignored in scope 1:.:.:wbmp.pro:<TRUE>:
 # OTHER_FILES = "wbmp.json"
 # PLUGIN_CLASS_NAME = "QWbmpPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/wbmp/CMakeLists.txt b/src/plugins/imageformats/wbmp/CMakeLists.txt
index 12d7501..ad0b1fe 100644
--- a/src/plugins/imageformats/wbmp/CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qwbmp
     TYPE imageformats
+    CLASS_NAME QWbmpPlugin
     SOURCES
         main.cpp
         qwbmphandler.cpp qwbmphandler_p.h
@@ -16,4 +17,5 @@ add_qt_plugin(qwbmp
 #### Keys ignored in scope 1:.:.:wbmp.pro:<TRUE>:
 # OTHER_FILES = "wbmp.json"
 # PLUGIN_CLASS_NAME = "QWbmpPlugin"
+# PLUGIN_TYPE = "imageformats"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/webp/.prev_CMakeLists.txt b/src/plugins/imageformats/webp/.prev_CMakeLists.txt
index eccbe8e..52f5937 100644
--- a/src/plugins/imageformats/webp/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/webp/.prev_CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qwebp
     TYPE imageformats
+    CLASS_NAME QWebpPlugin
     SOURCES
         main.cpp
         qwebphandler.cpp qwebphandler_p.h
@@ -16,5 +17,6 @@ add_qt_plugin(qwebp
 #### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
 # OTHER_FILES = "webp.json"
 # PLUGIN_CLASS_NAME = "QWebpPlugin"
+# PLUGIN_TYPE = "imageformats"
 # QT_FOR_CONFIG = "imageformats-private"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/webp/CMakeLists.txt b/src/plugins/imageformats/webp/CMakeLists.txt
index 2f81f42..a7f6384 100644
--- a/src/plugins/imageformats/webp/CMakeLists.txt
+++ b/src/plugins/imageformats/webp/CMakeLists.txt
@@ -6,6 +6,7 @@
 
 add_qt_plugin(qwebp
     TYPE imageformats
+    CLASS_NAME QWebpPlugin
     SOURCES
         main.cpp
         qwebphandler.cpp qwebphandler_p.h
@@ -17,5 +18,6 @@ add_qt_plugin(qwebp
 #### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
 # OTHER_FILES = "webp.json"
 # PLUGIN_CLASS_NAME = "QWebpPlugin"
+# PLUGIN_TYPE = "imageformats"
 # QT_FOR_CONFIG = "imageformats-private"
 # _LOADED = "qt_plugin"