CMake: Regenerate and fixup qtimageformats projectswip/cmake

A few changes happened since last update:
- CMake target names are now consistent with Qt 5 names
- ZLIB handling
- TIFF 3rd party handling
- Standalone tests simplification
- Updates in the SUBDIRS project
- Other minor changes

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

18 files changed, 217 insertions, 86 deletions

diff --git a/src/plugins/imageformats/.prev_CMakeLists.txt b/src/plugins/imageformats/.prev_CMakeLists.txt
index dfcc7e4..da2ff9f 100644
--- a/src/plugins/imageformats/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/.prev_CMakeLists.txt
@@ -1,13 +1,11 @@
 # Generated from imageformats.pro.
 
-if(NOT WINRT)
-    add_subdirectory(tga)
-endif()
+add_subdirectory(tga)
 add_subdirectory(wbmp)
-if(QT_FEATURE_tiff AND NOT WINRT)
+if(QT_FEATURE_tiff)
     add_subdirectory(tiff)
 endif()
-if(QT_FEATURE_webp AND NOT WINRT)
+if(QT_FEATURE_webp)
     add_subdirectory(webp)
 endif()
 if(APPLE)
diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
index 01855f4..6f7cb49 100644
--- a/src/plugins/imageformats/CMakeLists.txt
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -10,14 +10,12 @@ include(../../imageformats/configure.cmake)
 qt_feature_module_end(NO_MODULE)
 # special case end
 
-if(NOT WINRT)
-    add_subdirectory(tga)
-endif()
+add_subdirectory(tga)
 add_subdirectory(wbmp)
-if(QT_FEATURE_tiff AND NOT WINRT)
+if(QT_FEATURE_tiff)
     add_subdirectory(tiff)
 endif()
-if(QT_FEATURE_webp AND NOT WINRT)
+if(QT_FEATURE_webp)
     add_subdirectory(webp)
 endif()
 if(APPLE)
@@ -26,7 +24,7 @@ endif()
 if(QT_FEATURE_regularexpression)
     add_subdirectory(icns)
 endif()
-if(QT_FEATURE_mng AND OFF) # special case TODO: FiXME
+if(QT_FEATURE_mng AND OFF) # special case: FIXME
     add_subdirectory(mng)
 endif()
 if(QT_FEATURE_jasper)
@@ -35,4 +33,3 @@ endif()
 if(APPLE AND NOT QT_FEATURE_jasper)
     add_subdirectory(macjp2)
 endif()
-
diff --git a/src/plugins/imageformats/icns/.prev_CMakeLists.txt b/src/plugins/imageformats/icns/.prev_CMakeLists.txt
index cde94c2..715e544 100644
--- a/src/plugins/imageformats/icns/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/icns/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from icns.pro.
 
 #####################################################################
-## qicns Plugin:
+## QICNSPlugin Plugin:
 #####################################################################
 
-add_qt_plugin(qicns
+qt_add_plugin(QICNSPlugin
+    OUTPUT_NAME qicns
     TYPE imageformats
-    CLASS_NAME QICNSPlugin
     SOURCES
         main.cpp
         qicnshandler.cpp qicnshandler_p.h
@@ -20,4 +20,3 @@ add_qt_plugin(qicns
 
 #### Keys ignored in scope 1:.:.:icns.pro:<TRUE>:
 # OTHER_FILES = "icns.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/icns/CMakeLists.txt b/src/plugins/imageformats/icns/CMakeLists.txt
index 06980a6..715e544 100644
--- a/src/plugins/imageformats/icns/CMakeLists.txt
+++ b/src/plugins/imageformats/icns/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from icns.pro.
 
 #####################################################################
-## qicns Plugin:
+## QICNSPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qicns
+qt_add_plugin(QICNSPlugin
+    OUTPUT_NAME qicns
     TYPE imageformats
-    CLASS_NAME QICNSPlugin
     SOURCES
         main.cpp
         qicnshandler.cpp qicnshandler_p.h
diff --git a/src/plugins/imageformats/jp2/.prev_CMakeLists.txt b/src/plugins/imageformats/jp2/.prev_CMakeLists.txt
index f45df46..7afc730 100644
--- a/src/plugins/imageformats/jp2/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/jp2/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from jp2.pro.
 
 #####################################################################
-## qjp2 Plugin:
+## QJp2Plugin Plugin:
 #####################################################################
 
-add_qt_plugin(qjp2
+qt_add_plugin(QJp2Plugin
+    OUTPUT_NAME qjp2
     TYPE imageformats
-    CLASS_NAME QJp2Plugin
     SOURCES
         main.cpp
         qjp2handler.cpp qjp2handler_p.h
@@ -20,4 +20,3 @@ add_qt_plugin(qjp2
 #### Keys ignored in scope 1:.:.:jp2.pro:<TRUE>:
 # OTHER_FILES = "jp2.json"
 # 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 175c834..7afc730 100644
--- a/src/plugins/imageformats/jp2/CMakeLists.txt
+++ b/src/plugins/imageformats/jp2/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from jp2.pro.
 
 #####################################################################
-## qjp2 Plugin:
+## QJp2Plugin Plugin:
 #####################################################################
 
-qt_add_plugin(qjp2
+qt_add_plugin(QJp2Plugin
+    OUTPUT_NAME qjp2
     TYPE imageformats
-    CLASS_NAME QJp2Plugin
     SOURCES
         main.cpp
         qjp2handler.cpp qjp2handler_p.h
diff --git a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
index b791f5c..9618984 100644
--- a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
@@ -1,27 +1,26 @@
 # Generated from macheif.pro.
 
 #####################################################################
-## qmacheif Plugin:
+## QMacHeifPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qmacheif
+qt_add_plugin(QMacHeifPlugin
+    OUTPUT_NAME qmacheif
     TYPE imageformats
-    CLASS_NAME QMacHeifPlugin
     SOURCES
         ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h
         main.cpp
         qmacheifhandler.cpp qmacheifhandler.h
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         ${FWCoreFoundation}
         ${FWCoreGraphics}
         ${FWImageIO}
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 #### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>:
diff --git a/src/plugins/imageformats/macheif/CMakeLists.txt b/src/plugins/imageformats/macheif/CMakeLists.txt
index 6df9758..7d90b40 100644
--- a/src/plugins/imageformats/macheif/CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from macheif.pro.
 
 #####################################################################
-## qmacheif Plugin:
+## QMacHeifPlugin Plugin:
 #####################################################################
 
 # special case begin
@@ -10,24 +10,23 @@ find_library(FWCoreGraphics CoreGraphics)
 find_library(FWImageIO ImageIO)
 # special case end
 
-qt_add_plugin(qmacheif
+qt_add_plugin(QMacHeifPlugin
+    OUTPUT_NAME qmacheif
     TYPE imageformats
-    CLASS_NAME QMacHeifPlugin
     SOURCES
         ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h
         main.cpp
         qmacheifhandler.cpp qmacheifhandler.h
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         ${FWCoreFoundation}
         ${FWCoreGraphics}
         ${FWImageIO}
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 #### Keys ignored in scope 1:.:.:macheif.pro:<TRUE>:
diff --git a/src/plugins/imageformats/macjp2/CMakeLists.txt b/src/plugins/imageformats/macjp2/CMakeLists.txt
index 3dfbe12..94d5ab3 100644
--- a/src/plugins/imageformats/macjp2/CMakeLists.txt
+++ b/src/plugins/imageformats/macjp2/CMakeLists.txt
@@ -1,27 +1,26 @@
 # Generated from macjp2.pro.
 
 #####################################################################
-## qmacjp2 Plugin:
+## QMacJp2Plugin Plugin:
 #####################################################################
 
-qt_add_plugin(qmacjp2
+qt_add_plugin(QMacJp2Plugin
+    OUTPUT_NAME qmacjp2
     TYPE imageformats
-    CLASS_NAME QMacJp2Plugin
     SOURCES
         ../shared/qiiofhelpers.cpp ../shared/qiiofhelpers_p.h
         main.cpp
         qmacjp2handler.cpp qmacjp2handler.h
     INCLUDE_DIRECTORIES
         ../shared
-    LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
     PUBLIC_LIBRARIES
         ${FWCoreFoundation}
         ${FWCoreGraphics}
         ${FWImageIO}
         Qt::Core
+        Qt::CorePrivate
         Qt::Gui
+        Qt::GuiPrivate
 )
 
 #### Keys ignored in scope 1:.:.:macjp2.pro:<TRUE>:
diff --git a/src/plugins/imageformats/mng/CMakeLists.txt b/src/plugins/imageformats/mng/CMakeLists.txt
index ad84e53..185f602 100644
--- a/src/plugins/imageformats/mng/CMakeLists.txt
+++ b/src/plugins/imageformats/mng/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from mng.pro.
 
 #####################################################################
-## qmng Plugin:
+## QMngPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qmng
+qt_add_plugin(QMngPlugin
+    OUTPUT_NAME qmng
     TYPE imageformats
-    CLASS_NAME QMngPlugin
     SOURCES
         main.cpp
         qmnghandler.cpp qmnghandler_p.h
diff --git a/src/plugins/imageformats/tga/.prev_CMakeLists.txt b/src/plugins/imageformats/tga/.prev_CMakeLists.txt
index 6f28762..db1def3 100644
--- a/src/plugins/imageformats/tga/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tga/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from tga.pro.
 
 #####################################################################
-## qtga Plugin:
+## QTgaPlugin Plugin:
 #####################################################################
 
-add_qt_plugin(qtga
+qt_add_plugin(QTgaPlugin
+    OUTPUT_NAME qtga
     TYPE imageformats
-    CLASS_NAME QTgaPlugin
     SOURCES
         main.cpp
         qtgafile.cpp qtgafile.h
@@ -18,4 +18,3 @@ add_qt_plugin(qtga
 
 #### Keys ignored in scope 1:.:.:tga.pro:<TRUE>:
 # OTHER_FILES = "tga.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tga/CMakeLists.txt b/src/plugins/imageformats/tga/CMakeLists.txt
index 19f6f38..db1def3 100644
--- a/src/plugins/imageformats/tga/CMakeLists.txt
+++ b/src/plugins/imageformats/tga/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from tga.pro.
 
 #####################################################################
-## qtga Plugin:
+## QTgaPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qtga
+qt_add_plugin(QTgaPlugin
+    OUTPUT_NAME qtga
     TYPE imageformats
-    CLASS_NAME QTgaPlugin
     SOURCES
         main.cpp
         qtgafile.cpp qtgafile.h
diff --git a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
index fc9a65b..3ac1280 100644
--- a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
@@ -1,17 +1,15 @@
 # Generated from tiff.pro.
 
 #####################################################################
-## qtiff Plugin:
+## QTiffPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qtiff
+qt_add_plugin(QTiffPlugin
+    OUTPUT_NAME qtiff
     TYPE imageformats
-    CLASS_NAME QTiffPlugin
     SOURCES
         main.cpp
         qtiffhandler.cpp qtiffhandler_p.h
-    LIBRARIES
-        TIFF::TIFF
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
@@ -20,3 +18,76 @@ qt_add_plugin(qtiff
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
 # QT_FOR_CONFIG = "imageformats-private"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_tiff
+    LIBRARIES
+        TIFF::TIFF
+)
+
+qt_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/libtiff/tif_aux.c
+        ../../../3rdparty/libtiff/libtiff/tif_close.c
+        ../../../3rdparty/libtiff/libtiff/tif_codec.c
+        ../../../3rdparty/libtiff/libtiff/tif_color.c
+        ../../../3rdparty/libtiff/libtiff/tif_compress.c
+        ../../../3rdparty/libtiff/libtiff/tif_dir.c
+        ../../../3rdparty/libtiff/libtiff/tif_dirinfo.c
+        ../../../3rdparty/libtiff/libtiff/tif_dirread.c
+        ../../../3rdparty/libtiff/libtiff/tif_dirwrite.c
+        ../../../3rdparty/libtiff/libtiff/tif_dumpmode.c
+        ../../../3rdparty/libtiff/libtiff/tif_error.c
+        ../../../3rdparty/libtiff/libtiff/tif_extension.c
+        ../../../3rdparty/libtiff/libtiff/tif_fax3.c
+        ../../../3rdparty/libtiff/libtiff/tif_fax3sm.c
+        ../../../3rdparty/libtiff/libtiff/tif_flush.c
+        ../../../3rdparty/libtiff/libtiff/tif_getimage.c
+        ../../../3rdparty/libtiff/libtiff/tif_luv.c
+        ../../../3rdparty/libtiff/libtiff/tif_lzw.c
+        ../../../3rdparty/libtiff/libtiff/tif_next.c
+        ../../../3rdparty/libtiff/libtiff/tif_open.c
+        ../../../3rdparty/libtiff/libtiff/tif_packbits.c
+        ../../../3rdparty/libtiff/libtiff/tif_pixarlog.c
+        ../../../3rdparty/libtiff/libtiff/tif_predict.c
+        ../../../3rdparty/libtiff/libtiff/tif_print.c
+        ../../../3rdparty/libtiff/libtiff/tif_read.c
+        ../../../3rdparty/libtiff/libtiff/tif_strip.c
+        ../../../3rdparty/libtiff/libtiff/tif_swab.c
+        ../../../3rdparty/libtiff/libtiff/tif_thunder.c
+        ../../../3rdparty/libtiff/libtiff/tif_tile.c
+        ../../../3rdparty/libtiff/libtiff/tif_version.c
+        ../../../3rdparty/libtiff/libtiff/tif_warning.c
+        ../../../3rdparty/libtiff/libtiff/tif_write.c
+        ../../../3rdparty/libtiff/libtiff/tif_zip.c
+        ../../../3rdparty/libtiff/port/snprintf.c
+    INCLUDE_DIRECTORIES
+        ../../../3rdparty/libtiff/libtiff
+)
+
+qt_extend_target(QTiffPlugin CONDITION WIN32 AND NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/libtiff/tif_win32.c
+)
+
+qt_extend_target(QTiffPlugin CONDITION UNIX AND NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/libtiff/tif_unix.c
+)
+
+qt_extend_target(QTiffPlugin CONDITION ANDROID AND NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/port/lfind.c
+)
+
+qt_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_tiff
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff AND NOT QT_FEATURE_system_zlib
+    LIBRARIES
+        Qt::ZlibPrivate
+)
diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt
index bc85225..c9a7f56 100644
--- a/src/plugins/imageformats/tiff/CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/CMakeLists.txt
@@ -1,35 +1,102 @@
 # Generated from tiff.pro.
 
 #####################################################################
-## qtiff Plugin:
+## QTiffPlugin Plugin:
 #####################################################################
 
 # special case begin
-# Protect against case when ZLIB is found via QtGui in a static build,
-# which means that we can't do a qt_find_package() here due to CMake
-# complaining about not being able to make the ZLIB target global,
-# because ZLIB was found in the QtGui directory scope (root level) and
-# not in this directory scope.
-if(BUILD_SHARED_LIBS)
+# Handle the conditional finding of either system zlib or qt zlib.
+if(NOT QT_FEATURE_system_zlib)
+    find_package(Qt6 COMPONENTS Zlib)
+elseif(NOT TARGET ZLIB::ZLIB)
     qt_find_package(ZLIB PROVIDED_TARGETS ZLIB::ZLIB)
 endif()
 # special case end
 
-qt_add_plugin(qtiff
+qt_add_plugin(QTiffPlugin
+    OUTPUT_NAME qtiff
     TYPE imageformats
-    CLASS_NAME QTiffPlugin
     SOURCES
         main.cpp
         qtiffhandler.cpp qtiffhandler_p.h
-    LIBRARIES
-        TIFF::TIFF
-        ZLIB::ZLIB # special case
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        TIFF::TIFF # special case
 )
 
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
 # QT_FOR_CONFIG = "imageformats-private"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_tiff
+    LIBRARIES
+        TIFF::TIFF
+)
+
+qt_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/libtiff/tif_aux.c
+        ../../../3rdparty/libtiff/libtiff/tif_close.c
+        ../../../3rdparty/libtiff/libtiff/tif_codec.c
+        ../../../3rdparty/libtiff/libtiff/tif_color.c
+        ../../../3rdparty/libtiff/libtiff/tif_compress.c
+        ../../../3rdparty/libtiff/libtiff/tif_dir.c
+        ../../../3rdparty/libtiff/libtiff/tif_dirinfo.c
+        ../../../3rdparty/libtiff/libtiff/tif_dirread.c
+        ../../../3rdparty/libtiff/libtiff/tif_dirwrite.c
+        ../../../3rdparty/libtiff/libtiff/tif_dumpmode.c
+        ../../../3rdparty/libtiff/libtiff/tif_error.c
+        ../../../3rdparty/libtiff/libtiff/tif_extension.c
+        ../../../3rdparty/libtiff/libtiff/tif_fax3.c
+        ../../../3rdparty/libtiff/libtiff/tif_fax3sm.c
+        ../../../3rdparty/libtiff/libtiff/tif_flush.c
+        ../../../3rdparty/libtiff/libtiff/tif_getimage.c
+        ../../../3rdparty/libtiff/libtiff/tif_luv.c
+        ../../../3rdparty/libtiff/libtiff/tif_lzw.c
+        ../../../3rdparty/libtiff/libtiff/tif_next.c
+        ../../../3rdparty/libtiff/libtiff/tif_open.c
+        ../../../3rdparty/libtiff/libtiff/tif_packbits.c
+        ../../../3rdparty/libtiff/libtiff/tif_pixarlog.c
+        ../../../3rdparty/libtiff/libtiff/tif_predict.c
+        ../../../3rdparty/libtiff/libtiff/tif_print.c
+        ../../../3rdparty/libtiff/libtiff/tif_read.c
+        ../../../3rdparty/libtiff/libtiff/tif_strip.c
+        ../../../3rdparty/libtiff/libtiff/tif_swab.c
+        ../../../3rdparty/libtiff/libtiff/tif_thunder.c
+        ../../../3rdparty/libtiff/libtiff/tif_tile.c
+        ../../../3rdparty/libtiff/libtiff/tif_version.c
+        ../../../3rdparty/libtiff/libtiff/tif_warning.c
+        ../../../3rdparty/libtiff/libtiff/tif_write.c
+        ../../../3rdparty/libtiff/libtiff/tif_zip.c
+        ../../../3rdparty/libtiff/port/snprintf.c
+    INCLUDE_DIRECTORIES
+        ../../../3rdparty/libtiff/libtiff
+)
+
+qt_extend_target(QTiffPlugin CONDITION WIN32 AND NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/libtiff/tif_win32.c
+)
+
+qt_extend_target(QTiffPlugin CONDITION UNIX AND NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/libtiff/tif_unix.c
+)
+
+qt_extend_target(QTiffPlugin CONDITION ANDROID AND NOT QT_FEATURE_system_tiff
+    SOURCES
+        ../../../3rdparty/libtiff/port/lfind.c
+)
+
+qt_extend_target(QTiffPlugin CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_tiff
+    LIBRARIES
+        ZLIB::ZLIB
+)
+
+qt_extend_target(QTiffPlugin CONDITION NOT QT_FEATURE_system_tiff AND NOT QT_FEATURE_system_zlib
+    LIBRARIES
+        Qt::ZlibPrivate
+)
diff --git a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt b/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
index ae25820..2d6484a 100644
--- a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from wbmp.pro.
 
 #####################################################################
-## qwbmp Plugin:
+## QWbmpPlugin Plugin:
 #####################################################################
 
-add_qt_plugin(qwbmp
+qt_add_plugin(QWbmpPlugin
+    OUTPUT_NAME qwbmp
     TYPE imageformats
-    CLASS_NAME QWbmpPlugin
     SOURCES
         main.cpp
         qwbmphandler.cpp qwbmphandler_p.h
@@ -17,4 +17,3 @@ add_qt_plugin(qwbmp
 
 #### Keys ignored in scope 1:.:.:wbmp.pro:<TRUE>:
 # OTHER_FILES = "wbmp.json"
-# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/wbmp/CMakeLists.txt b/src/plugins/imageformats/wbmp/CMakeLists.txt
index b446a1b..2d6484a 100644
--- a/src/plugins/imageformats/wbmp/CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from wbmp.pro.
 
 #####################################################################
-## qwbmp Plugin:
+## QWbmpPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwbmp
+qt_add_plugin(QWbmpPlugin
+    OUTPUT_NAME qwbmp
     TYPE imageformats
-    CLASS_NAME QWbmpPlugin
     SOURCES
         main.cpp
         qwbmphandler.cpp qwbmphandler_p.h
diff --git a/src/plugins/imageformats/webp/.prev_CMakeLists.txt b/src/plugins/imageformats/webp/.prev_CMakeLists.txt
index 3b5416f..b1edce6 100644
--- a/src/plugins/imageformats/webp/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/webp/.prev_CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from webp.pro.
 
 #####################################################################
-## qwebp Plugin:
+## QWebpPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwebp
+qt_add_plugin(QWebpPlugin
+    OUTPUT_NAME qwebp
     TYPE imageformats
-    CLASS_NAME QWebpPlugin
     SOURCES
         main.cpp
         qwebphandler.cpp qwebphandler_p.h
@@ -19,3 +19,6 @@ qt_add_plugin(qwebp
 #### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
 # OTHER_FILES = "webp.json"
 # QT_FOR_CONFIG = "imageformats-private"
+
+## Scopes:
+#####################################################################
diff --git a/src/plugins/imageformats/webp/CMakeLists.txt b/src/plugins/imageformats/webp/CMakeLists.txt
index 1385e63..b1edce6 100644
--- a/src/plugins/imageformats/webp/CMakeLists.txt
+++ b/src/plugins/imageformats/webp/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Generated from webp.pro.
 
 #####################################################################
-## qwebp Plugin:
+## QWebpPlugin Plugin:
 #####################################################################
 
-qt_add_plugin(qwebp
+qt_add_plugin(QWebpPlugin
+    OUTPUT_NAME qwebp
     TYPE imageformats
-    CLASS_NAME QWebpPlugin
     SOURCES
         main.cpp
         qwebphandler.cpp qwebphandler_p.h
@@ -14,9 +14,11 @@ qt_add_plugin(qwebp
         Qt::Core
         Qt::Gui
         WrapWebP::WrapWebP
-        Qt::Gui # special case
 )
 
 #### Keys ignored in scope 1:.:.:webp.pro:<TRUE>:
 # OTHER_FILES = "webp.json"
 # QT_FOR_CONFIG = "imageformats-private"
+
+## Scopes:
+#####################################################################