From b65e7b2ffee52b7a9f6df829c7925fa54b4d7ad8 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 6 May 2019 15:28:53 +0200
Subject: CMake: Regenerate src/plugins/imageformats

Change-Id: Iea0f1b5f51508b7e8c2cad405dd3e293186c583a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/plugins/imageformats/CMakeLists.txt      | 11 +++++++----
 src/plugins/imageformats/gif/CMakeLists.txt  | 11 +++++++++--
 src/plugins/imageformats/ico/CMakeLists.txt  | 10 ++++++++--
 src/plugins/imageformats/jpeg/CMakeLists.txt | 15 +++++++++++----
 4 files changed, 35 insertions(+), 12 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
index cd5c0347e5..9b39538e7c 100644
--- a/src/plugins/imageformats/CMakeLists.txt
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -1,11 +1,14 @@
-if(QT_FEATURE_gif)
-    add_subdirectory(gif)
-endif()
+# 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()
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt
index efd910c3ff..f6ca369b69 100644
--- a/src/plugins/imageformats/gif/CMakeLists.txt
+++ b/src/plugins/imageformats/gif/CMakeLists.txt
@@ -9,6 +9,13 @@ add_qt_plugin(qgif
     SOURCES
         main.cpp main.h
         qgifhandler.cpp qgifhandler_p.h
-    LIBRARIES
-        Qt::Gui
+    LIBRARIES # special case
+        Qt::GuiPrivate # special case
+    PUBLIC_LIBRARIES # special case
+        Qt::Gui # special case
 )
+
+#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>:
+# OTHER_FILES = "gif.json"
+# PLUGIN_CLASS_NAME = "QGifPlugin"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
index 52550eab60..160b440dff 100644
--- a/src/plugins/imageformats/ico/CMakeLists.txt
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -10,6 +10,12 @@ add_qt_plugin(qico
         main.cpp main.h
         qicohandler.cpp qicohandler.h
     LIBRARIES
-        Qt::Gui
-        Qt::CorePrivate
+        Qt::GuiPrivate # special case
+    PUBLIC_LIBRARIES # special case
+        Qt::Gui # special case
 )
+
+#### Keys ignored in scope 1:.:.:ico.pro:<TRUE>:
+# OTHER_FILES = "ico.json"
+# PLUGIN_CLASS_NAME = "QICOPlugin"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index 39c45bc2fe..1c4627cb4f 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -1,19 +1,26 @@
 # Generated from jpeg.pro.
 
+qt_find_package(JPEG) # special case
+
 #####################################################################
 ## qjpeg Plugin:
 #####################################################################
 
-qt_find_package(JPEG) # special case
-
 add_qt_plugin(qjpeg
     TYPE imageformats
     SOURCES
         main.cpp main.h
         qjpeghandler.cpp qjpeghandler_p.h
     LIBRARIES
-        Qt::Gui
-        Qt::CorePrivate
+        # Qt::CorePrivate # special case: remove
         Qt::GuiPrivate
+    PUBLIC_LIBRARIES # special case
         JPEG::JPEG
+        # Qt::Core # special case: remove
+        Qt::Gui # special case
 )
+
+#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
+# OTHER_FILES = "jpeg.json"
+# PLUGIN_CLASS_NAME = "QJpegPlugin"
+# _LOADED = "qt_plugin"
-- 
cgit v1.2.3