Regenerate projects before merge

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

18 files changed, 32 insertions, 44 deletions

diff --git a/src/plugins/imageformats/.prev_CMakeLists.txt b/src/plugins/imageformats/.prev_CMakeLists.txt
index bf6c12a..dfcc7e4 100644
--- a/src/plugins/imageformats/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/.prev_CMakeLists.txt
@@ -22,6 +22,6 @@ endif()
 if(QT_FEATURE_jasper)
     add_subdirectory(jp2)
 endif()
-if(((APPLE AND else)))
+if(APPLE AND NOT QT_FEATURE_jasper)
     add_subdirectory(macjp2)
 endif()
diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
index 256e0d9..01855f4 100644
--- a/src/plugins/imageformats/CMakeLists.txt
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -32,7 +32,7 @@ endif()
 if(QT_FEATURE_jasper)
     add_subdirectory(jp2)
 endif()
-if(APPLE) # special case
-    add_subdirectory(macjp2) # special case
-endif() # special case
+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 e85c4b5..cde94c2 100644
--- a/src/plugins/imageformats/icns/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/icns/.prev_CMakeLists.txt
@@ -13,10 +13,11 @@ add_qt_plugin(qicns
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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 99a7643..cde94c2 100644
--- a/src/plugins/imageformats/icns/CMakeLists.txt
+++ b/src/plugins/imageformats/icns/CMakeLists.txt
@@ -13,12 +13,11 @@ add_qt_plugin(qicns
     DEFINES
         QT_NO_CAST_FROM_ASCII
         QT_NO_CAST_TO_ASCII
-    LIBRARIES # special case
-        Qt::Gui # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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
index 7ed0594..f45df46 100644
--- a/src/plugins/imageformats/jp2/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/jp2/.prev_CMakeLists.txt
@@ -12,11 +12,12 @@ add_qt_plugin(qjp2
         qjp2handler.cpp qjp2handler_p.h
     LIBRARIES
         WrapJasper::WrapJasper
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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 5e7fd3b..f45df46 100644
--- a/src/plugins/imageformats/jp2/CMakeLists.txt
+++ b/src/plugins/imageformats/jp2/CMakeLists.txt
@@ -12,12 +12,12 @@ add_qt_plugin(qjp2
         qjp2handler.cpp qjp2handler_p.h
     LIBRARIES
         WrapJasper::WrapJasper
-        Qt::Gui # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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 27a8682..4ee32c7 100644
--- a/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/.prev_CMakeLists.txt
@@ -26,6 +26,4 @@ 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 82950cb..22631d7 100644
--- a/src/plugins/imageformats/macheif/CMakeLists.txt
+++ b/src/plugins/imageformats/macheif/CMakeLists.txt
@@ -32,6 +32,4 @@ 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 058e437..9fbb1a4 100644
--- a/src/plugins/imageformats/macjp2/CMakeLists.txt
+++ b/src/plugins/imageformats/macjp2/CMakeLists.txt
@@ -26,6 +26,4 @@ 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 5836e64..095f5a7 100644
--- a/src/plugins/imageformats/mng/CMakeLists.txt
+++ b/src/plugins/imageformats/mng/CMakeLists.txt
@@ -19,7 +19,5 @@ add_qt_plugin(qmng
 
 #### Keys ignored in scope 1:.:.:mng.pro:<TRUE>:
 # OTHER_FILES = "mng.json"
-# PLUGIN_CLASS_NAME = "QMngPlugin"
-# PLUGIN_TYPE = "imageformats"
 # QT_FOR_CONFIG = "imageformats-private"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tga/.prev_CMakeLists.txt b/src/plugins/imageformats/tga/.prev_CMakeLists.txt
index 6f81410..6f28762 100644
--- a/src/plugins/imageformats/tga/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tga/.prev_CMakeLists.txt
@@ -11,10 +11,11 @@ add_qt_plugin(qtga
         main.cpp
         qtgafile.cpp qtgafile.h
         qtgahandler.cpp qtgahandler.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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 afd53f1..6f28762 100644
--- a/src/plugins/imageformats/tga/CMakeLists.txt
+++ b/src/plugins/imageformats/tga/CMakeLists.txt
@@ -11,13 +11,11 @@ add_qt_plugin(qtga
         main.cpp
         qtgafile.cpp qtgafile.h
         qtgahandler.cpp qtgahandler.h
-    LIBRARIES # special case
-        Qt::Gui # special case
-
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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 a2737ab..3fb2da8 100644
--- a/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/.prev_CMakeLists.txt
@@ -19,7 +19,5 @@ add_qt_plugin(qtiff
 
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
-# PLUGIN_CLASS_NAME = "QTiffPlugin"
-# PLUGIN_TYPE = "imageformats"
 # QT_FOR_CONFIG = "imageformats-private"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt
index 05346b4..5224c78 100644
--- a/src/plugins/imageformats/tiff/CMakeLists.txt
+++ b/src/plugins/imageformats/tiff/CMakeLists.txt
@@ -32,7 +32,5 @@ add_qt_plugin(qtiff
 
 #### Keys ignored in scope 1:.:.:tiff.pro:<TRUE>:
 # OTHER_FILES = "tiff.json"
-# PLUGIN_CLASS_NAME = "QTiffPlugin"
-# PLUGIN_TYPE = "imageformats"
 # QT_FOR_CONFIG = "imageformats-private"
 # _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt b/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
index fb3982c..ae25820 100644
--- a/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/.prev_CMakeLists.txt
@@ -10,10 +10,11 @@ add_qt_plugin(qwbmp
     SOURCES
         main.cpp
         qwbmphandler.cpp qwbmphandler_p.h
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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 ad0b1fe..ae25820 100644
--- a/src/plugins/imageformats/wbmp/CMakeLists.txt
+++ b/src/plugins/imageformats/wbmp/CMakeLists.txt
@@ -10,12 +10,11 @@ add_qt_plugin(qwbmp
     SOURCES
         main.cpp
         qwbmphandler.cpp qwbmphandler_p.h
-    LIBRARIES # special case
-        Qt::Gui # special case
+    PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
 )
 
 #### 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 52f5937..c37829b 100644
--- a/src/plugins/imageformats/webp/.prev_CMakeLists.txt
+++ b/src/plugins/imageformats/webp/.prev_CMakeLists.txt
@@ -11,12 +11,12 @@ add_qt_plugin(qwebp
         main.cpp
         qwebphandler.cpp qwebphandler_p.h
     PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
         WrapWebP::WrapWebP
 )
 
 #### 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 a7f6384..4b6322e 100644
--- a/src/plugins/imageformats/webp/CMakeLists.txt
+++ b/src/plugins/imageformats/webp/CMakeLists.txt
@@ -11,13 +11,13 @@ add_qt_plugin(qwebp
         main.cpp
         qwebphandler.cpp qwebphandler_p.h
     PUBLIC_LIBRARIES
+        Qt::Core
+        Qt::Gui
         WrapWebP::WrapWebP
         Qt::Gui # special case
 )
 
 #### 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"