From cd408af9bc11881f351b359ebf81f02f0f69ef86 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 22 Jul 2019 19:32:23 +0200 Subject: Add some missing CLASS_NAME values to plugins This substantially decreases the number of warnings when doing a Qt static build with examples. This is a quickfix modifying the relevant files directly. A proper fix will follow that regenerates the whole files. Change-Id: I2a3cc2c4ea02b3412beb96f7b4be9d43365a460d Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/plugins/bearer/generic/CMakeLists.txt | 1 + src/plugins/generic/tuiotouch/CMakeLists.txt | 1 + src/plugins/imageformats/gif/CMakeLists.txt | 1 + src/plugins/imageformats/jpeg/CMakeLists.txt | 1 + src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt | 1 + src/plugins/sqldrivers/sqlite/CMakeLists.txt | 1 + src/plugins/styles/mac/CMakeLists.txt | 14 ++++++++++---- 7 files changed, 16 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index f68b34a99b..54e9ca62f3 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qgenericbearer TYPE bearer + CLASS_NAME QGenericEnginePlugin SOURCES ../platformdefs_win.h ../qbearerengine_impl.h diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt index c6452780c5..0907f571a9 100644 --- a/src/plugins/generic/tuiotouch/CMakeLists.txt +++ b/src/plugins/generic/tuiotouch/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qtuiotouchplugin TYPE generic + CLASS_NAME QTuioTouchPlugin SOURCES main.cpp qoscbundle.cpp qoscbundle_p.h diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt index f6ca369b69..be23fd4f32 100644 --- a/src/plugins/imageformats/gif/CMakeLists.txt +++ b/src/plugins/imageformats/gif/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qgif TYPE imageformats + CLASS_NAME QGifPlugin SOURCES main.cpp main.h qgifhandler.cpp qgifhandler_p.h diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 1c4627cb4f..6d1da65d93 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -8,6 +8,7 @@ qt_find_package(JPEG) # special case add_qt_plugin(qjpeg TYPE imageformats + CLASS_NAME QJpegPlugin SOURCES main.cpp main.h qjpeghandler.cpp qjpeghandler_p.h diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index 59e555cde0..cdc272ea74 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qxdgdesktopportal TYPE platformthemes + CLASS_NAME QXdgDesktopPortalThemePlugin SOURCES main.cpp qxdgdesktopportalfiledialog.cpp qxdgdesktopportalfiledialog_p.h diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 4034f3f4e0..105d8028a9 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qsqlite TYPE sqldrivers + CLASS_NAME QSQLiteDriverPlugin SOURCES qsql_sqlite.cpp qsql_sqlite_p.h smain.cpp diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt index 1daee30060..0628f28811 100644 --- a/src/plugins/styles/mac/CMakeLists.txt +++ b/src/plugins/styles/mac/CMakeLists.txt @@ -6,14 +6,20 @@ add_qt_plugin(qmacstyle TYPE styles + CLASS_NAME QMacStylePlugin SOURCES main.mm qmacstyle_mac.mm qmacstyle_mac_p.h qmacstyle_mac_p_p.h LIBRARIES - Qt::WidgetsPrivate ${FWAppKit} - # DISTFILES = "macstyle.json" - # PLUGIN_CLASS_NAME = "QMacStylePlugin" - # _LOADED = "qt_plugin" + Qt::WidgetsPrivate + PUBLIC_LIBRARIES + Qt::Widgets ) + +#### Keys ignored in scope 1:.:.:mac.pro:: +# DISTFILES = "macstyle.json" +# PLUGIN_CLASS_NAME = "QMacStylePlugin" +# PLUGIN_TYPE = "styles" +# _LOADED = "qt_plugin" -- cgit v1.2.3