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>

1 files changed, 5 insertions, 6 deletions

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>: