From b10d8eab047c387409716ae87422d2efffee3159 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 22 Jan 2020 14:23:02 +0100 Subject: Regenerate plugin projects to get new target names And also to get the original output names (qmake's "TARGET"), so that the plugin file names are as they were in Qt 5. Change-Id: I96a060d1a81693652847857372bec334728cb549 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/plugins/imageformats/gif/.prev_CMakeLists.txt | 6 +++--- src/plugins/imageformats/gif/CMakeLists.txt | 6 +++--- src/plugins/imageformats/ico/.prev_CMakeLists.txt | 7 +++---- src/plugins/imageformats/ico/CMakeLists.txt | 6 +++--- src/plugins/imageformats/jpeg/.prev_CMakeLists.txt | 6 +++--- src/plugins/imageformats/jpeg/CMakeLists.txt | 6 +++--- 6 files changed, 18 insertions(+), 19 deletions(-) (limited to 'src/plugins/imageformats') diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt index 0dcdf2954d..b4923b81b1 100644 --- a/src/plugins/imageformats/gif/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from gif.pro. ##################################################################### -## qgif Plugin: +## QGifPlugin Plugin: ##################################################################### -qt_add_plugin(qgif +qt_add_plugin(QGifPlugin + OUTPUT_NAME qgif TYPE imageformats - CLASS_NAME QGifPlugin SOURCES main.cpp main.h qgifhandler.cpp qgifhandler_p.h diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt index 0255212201..c6780e32e9 100644 --- a/src/plugins/imageformats/gif/CMakeLists.txt +++ b/src/plugins/imageformats/gif/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from gif.pro. ##################################################################### -## qgif Plugin: +## QGifPlugin Plugin: ##################################################################### -qt_add_plugin(qgif +qt_add_plugin(QGifPlugin + OUTPUT_NAME qgif TYPE imageformats - CLASS_NAME QGifPlugin SOURCES main.cpp main.h qgifhandler.cpp qgifhandler_p.h diff --git a/src/plugins/imageformats/ico/.prev_CMakeLists.txt b/src/plugins/imageformats/ico/.prev_CMakeLists.txt index d054bd9936..6151d6fd07 100644 --- a/src/plugins/imageformats/ico/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/ico/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from ico.pro. ##################################################################### -## qico Plugin: +## QICOPlugin Plugin: ##################################################################### -add_qt_plugin(qico +qt_add_plugin(QICOPlugin + OUTPUT_NAME qico TYPE imageformats - CLASS_NAME QICOPlugin SOURCES main.cpp main.h qicohandler.cpp qicohandler.h @@ -19,4 +19,3 @@ add_qt_plugin(qico #### Keys ignored in scope 1:.:.:ico.pro:: # OTHER_FILES = "ico.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt index a07eb59655..6151d6fd07 100644 --- a/src/plugins/imageformats/ico/CMakeLists.txt +++ b/src/plugins/imageformats/ico/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from ico.pro. ##################################################################### -## qico Plugin: +## QICOPlugin Plugin: ##################################################################### -qt_add_plugin(qico +qt_add_plugin(QICOPlugin + OUTPUT_NAME qico TYPE imageformats - CLASS_NAME QICOPlugin SOURCES main.cpp main.h qicohandler.cpp qicohandler.h diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index 53239e923f..8a470e3e01 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from jpeg.pro. ##################################################################### -## qjpeg Plugin: +## QJpegPlugin Plugin: ##################################################################### -qt_add_plugin(qjpeg +qt_add_plugin(QJpegPlugin + OUTPUT_NAME qjpeg TYPE imageformats - CLASS_NAME QJpegPlugin SOURCES main.cpp main.h qjpeghandler.cpp qjpeghandler_p.h diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index b6a7c73ea6..18ebf12d65 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -3,12 +3,12 @@ qt_find_package(JPEG) # special case ##################################################################### -## qjpeg Plugin: +## QJpegPlugin Plugin: ##################################################################### -qt_add_plugin(qjpeg +qt_add_plugin(QJpegPlugin + OUTPUT_NAME qjpeg TYPE imageformats - CLASS_NAME QJpegPlugin SOURCES main.cpp main.h qjpeghandler.cpp qjpeghandler_p.h -- cgit v1.2.3