summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-07 17:45:35 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-08 13:10:01 +0000
commit115a76297b3c9f94b5258b42270228f06c96a575 (patch)
tree24806a9de32481334936c7ab9661f9c5408822b3 /src/plugins/imageformats
parent9ff225b0e0fdd6472bcfee0b4d810239940dea42 (diff)
Regenerate plugins bearer and imageformats projects
Change-Id: I8858aaf6b96ea030a3af143099aee5dfd15655c8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/plugins/imageformats')
-rw-r--r--src/plugins/imageformats/CMakeLists.txt3
-rw-r--r--src/plugins/imageformats/gif/.prev_CMakeLists.txt20
-rw-r--r--src/plugins/imageformats/gif/CMakeLists.txt1
-rw-r--r--src/plugins/imageformats/ico/.prev_CMakeLists.txt22
-rw-r--r--src/plugins/imageformats/ico/CMakeLists.txt11
-rw-r--r--src/plugins/imageformats/jpeg/.prev_CMakeLists.txt24
-rw-r--r--src/plugins/imageformats/jpeg/CMakeLists.txt9
7 files changed, 75 insertions, 15 deletions
diff --git a/src/plugins/imageformats/CMakeLists.txt b/src/plugins/imageformats/CMakeLists.txt
index 9b39538e7c..00fefbdc0d 100644
--- a/src/plugins/imageformats/CMakeLists.txt
+++ b/src/plugins/imageformats/CMakeLists.txt
@@ -1,14 +1,11 @@
# 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/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..c4add000b2
--- /dev/null
+++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt
@@ -0,0 +1,20 @@
+# Generated from gif.pro.
+
+#####################################################################
+## qgif Plugin:
+#####################################################################
+
+add_qt_plugin(qgif
+ TYPE imageformats
+ CLASS_NAME QGifPlugin
+ SOURCES
+ main.cpp main.h
+ qgifhandler.cpp qgifhandler_p.h
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:gif.pro:<TRUE>:
+# OTHER_FILES = "gif.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt
index be23fd4f32..f9d90c6825 100644
--- a/src/plugins/imageformats/gif/CMakeLists.txt
+++ b/src/plugins/imageformats/gif/CMakeLists.txt
@@ -18,5 +18,4 @@ add_qt_plugin(qgif
#### 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/.prev_CMakeLists.txt b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..d054bd9936
--- /dev/null
+++ b/src/plugins/imageformats/ico/.prev_CMakeLists.txt
@@ -0,0 +1,22 @@
+# Generated from ico.pro.
+
+#####################################################################
+## qico Plugin:
+#####################################################################
+
+add_qt_plugin(qico
+ TYPE imageformats
+ CLASS_NAME QICOPlugin
+ SOURCES
+ main.cpp main.h
+ qicohandler.cpp qicohandler.h
+ LIBRARIES
+ Qt::CorePrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:ico.pro:<TRUE>:
+# OTHER_FILES = "ico.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt
index 976ab98266..d054bd9936 100644
--- a/src/plugins/imageformats/ico/CMakeLists.txt
+++ b/src/plugins/imageformats/ico/CMakeLists.txt
@@ -6,18 +6,17 @@
add_qt_plugin(qico
TYPE imageformats
+ CLASS_NAME QICOPlugin
SOURCES
main.cpp main.h
qicohandler.cpp qicohandler.h
LIBRARIES
- Qt::GuiPrivate # special case
- PUBLIC_LIBRARIES # special case
- Qt::Gui # special case
- CLASS_NAME
- QICOPlugin
+ Qt::CorePrivate
+ PUBLIC_LIBRARIES
+ Qt::Core
+ Qt::Gui
)
#### 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/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..5d2f2d9a63
--- /dev/null
+++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt
@@ -0,0 +1,24 @@
+# Generated from jpeg.pro.
+
+#####################################################################
+## qjpeg Plugin:
+#####################################################################
+
+add_qt_plugin(qjpeg
+ TYPE imageformats
+ CLASS_NAME QJpegPlugin
+ SOURCES
+ main.cpp main.h
+ qjpeghandler.cpp qjpeghandler_p.h
+ LIBRARIES
+ Qt::CorePrivate
+ Qt::GuiPrivate
+ PUBLIC_LIBRARIES
+ JPEG::JPEG
+ Qt::Core
+ Qt::Gui
+)
+
+#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
+# OTHER_FILES = "jpeg.json"
+# _LOADED = "qt_plugin"
diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt
index 6d1da65d93..065ac08af6 100644
--- a/src/plugins/imageformats/jpeg/CMakeLists.txt
+++ b/src/plugins/imageformats/jpeg/CMakeLists.txt
@@ -13,15 +13,14 @@ add_qt_plugin(qjpeg
main.cpp main.h
qjpeghandler.cpp qjpeghandler_p.h
LIBRARIES
- # Qt::CorePrivate # special case: remove
+ Qt::CorePrivate
Qt::GuiPrivate
- PUBLIC_LIBRARIES # special case
+ PUBLIC_LIBRARIES
JPEG::JPEG
- # Qt::Core # special case: remove
- Qt::Gui # special case
+ Qt::Core
+ Qt::Gui
)
#### Keys ignored in scope 1:.:.:jpeg.pro:<TRUE>:
# OTHER_FILES = "jpeg.json"
-# PLUGIN_CLASS_NAME = "QJpegPlugin"
# _LOADED = "qt_plugin"