diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-22 14:23:02 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-27 11:49:34 +0000 |
| commit | b10d8eab047c387409716ae87422d2efffee3159 (patch) | |
| tree | f5ce14f553e5b8de3b2ebda30965ce4f5df380d6 /src | |
| parent | 604aa83ad910c3a17af33850312d3c61a59f558f (diff) | |
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 <simon.hausmann@qt.io>
Diffstat (limited to 'src')
66 files changed, 301 insertions, 302 deletions
diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index 8aee553d86..d3471f4e63 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from src.pro. ##################################################################### -## qandroidbearer Plugin: +## QAndroidBearerEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qandroidbearer +qt_add_plugin(QAndroidBearerEnginePlugin + OUTPUT_NAME qandroidbearer TYPE bearer - CLASS_NAME QAndroidBearerEnginePlugin SOURCES main.cpp qandroidbearerengine.cpp qandroidbearerengine.h diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index 1dc42fcce3..55aaa41491 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -1,12 +1,13 @@ # Generated from connman.pro. ##################################################################### -## qconnmanbearer Plugin: +## QConnmanEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qconnmanbearer - TYPE bearer +qt_add_plugin(QConnmanEnginePlugin + OUTPUT_NAME qconnmanbearer CLASS_NAME QConnmanEnginePlugin + TYPE bearer SOURCES main.cpp qconnmanengine.cpp qconnmanengine.h diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index 1dc42fcce3..6e5f34f6a4 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from connman.pro. ##################################################################### -## qconnmanbearer Plugin: +## QConnmanEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qconnmanbearer +qt_add_plugin(QConnmanEnginePlugin + OUTPUT_NAME qconnmanbearer TYPE bearer - CLASS_NAME QConnmanEnginePlugin SOURCES main.cpp qconnmanengine.cpp qconnmanengine.h diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index 914f5ceae1..eda3b85499 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from corewlan.pro. ##################################################################### -## qcorewlanbearer Plugin: +## QCoreWlanEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qcorewlanbearer +qt_add_plugin(QCoreWlanEnginePlugin + OUTPUT_NAME qcorewlanbearer TYPE bearer - CLASS_NAME QCoreWlanEnginePlugin SOURCES main.cpp qcorewlanengine.h qcorewlanengine.mm @@ -26,7 +26,7 @@ qt_add_plugin(qcorewlanbearer ## Scopes: ##################################################################### -qt_extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan +qt_extend_target(QCoreWlanEnginePlugin CONDITION QT_FEATURE_corewlan PUBLIC_LIBRARIES ${FWCoreWLAN} ${FWSecurity} diff --git a/src/plugins/bearer/generic/CMakeLists.txt b/src/plugins/bearer/generic/CMakeLists.txt index c41688e82a..0717b83dd3 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from generic.pro. ##################################################################### -## qgenericbearer Plugin: +## QGenericEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qgenericbearer +qt_add_plugin(QGenericEnginePlugin + OUTPUT_NAME qgenericbearer TYPE bearer - CLASS_NAME QGenericEnginePlugin SOURCES ../platformdefs_win.h main.cpp @@ -25,7 +25,7 @@ qt_add_plugin(qgenericbearer ## Scopes: ##################################################################### -qt_extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT +qt_extend_target(QGenericEnginePlugin CONDITION WIN32 AND NOT WINRT PUBLIC_LIBRARIES iphlpapi ) diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt index 2d86926aff..df5927024d 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -1,12 +1,13 @@ # Generated from networkmanager.pro. ##################################################################### -## qnmbearer Plugin: +## QNetworkManagerEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qnmbearer - TYPE bearer +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer CLASS_NAME QNetworkManagerEnginePlugin + TYPE bearer SOURCES main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index 2d86926aff..9c9721cca7 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from networkmanager.pro. ##################################################################### -## qnmbearer Plugin: +## QNetworkManagerEnginePlugin Plugin: ##################################################################### -qt_add_plugin(qnmbearer +qt_add_plugin(QNetworkManagerEnginePlugin + OUTPUT_NAME qnmbearer TYPE bearer - CLASS_NAME QNetworkManagerEnginePlugin SOURCES main.cpp qnetworkmanagerengine.cpp qnetworkmanagerengine.h diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt index e8adbd6d51..735d01de40 100644 --- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt +++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from evdevkeyboard.pro. ##################################################################### -## qevdevkeyboardplugin Plugin: +## QEvdevKeyboardPlugin Plugin: ##################################################################### -qt_add_plugin(qevdevkeyboardplugin +qt_add_plugin(QEvdevKeyboardPlugin + OUTPUT_NAME qevdevkeyboardplugin TYPE generic - CLASS_NAME QEvdevKeyboardPlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt index fc6b3d30c2..328d815cdf 100644 --- a/src/plugins/generic/evdevmouse/CMakeLists.txt +++ b/src/plugins/generic/evdevmouse/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from evdevmouse.pro. ##################################################################### -## qevdevmouseplugin Plugin: +## QEvdevMousePlugin Plugin: ##################################################################### -qt_add_plugin(qevdevmouseplugin +qt_add_plugin(QEvdevMousePlugin + OUTPUT_NAME qevdevmouseplugin TYPE generic - CLASS_NAME QEvdevMousePlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt index 1479a2f66b..e7d6fbb527 100644 --- a/src/plugins/generic/evdevtablet/CMakeLists.txt +++ b/src/plugins/generic/evdevtablet/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from evdevtablet.pro. ##################################################################### -## qevdevtabletplugin Plugin: +## QEvdevTabletPlugin Plugin: ##################################################################### -qt_add_plugin(qevdevtabletplugin +qt_add_plugin(QEvdevTabletPlugin + OUTPUT_NAME qevdevtabletplugin TYPE generic - CLASS_NAME QEvdevTabletPlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt index 79e11d7969..b6c2131f33 100644 --- a/src/plugins/generic/evdevtouch/CMakeLists.txt +++ b/src/plugins/generic/evdevtouch/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from evdevtouch.pro. ##################################################################### -## qevdevtouchplugin Plugin: +## QEvdevTouchScreenPlugin Plugin: ##################################################################### -qt_add_plugin(qevdevtouchplugin +qt_add_plugin(QEvdevTouchScreenPlugin + OUTPUT_NAME qevdevtouchplugin TYPE generic - CLASS_NAME QEvdevTouchScreenPlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt index d0a60938cd..30fa36aa85 100644 --- a/src/plugins/generic/libinput/CMakeLists.txt +++ b/src/plugins/generic/libinput/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from libinput.pro. ##################################################################### -## qlibinputplugin Plugin: +## QLibInputPlugin Plugin: ##################################################################### -qt_add_plugin(qlibinputplugin +qt_add_plugin(QLibInputPlugin + OUTPUT_NAME qlibinputplugin TYPE generic - CLASS_NAME QLibInputPlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt index fe71451ae4..83ca4f264b 100644 --- a/src/plugins/generic/tslib/.prev_CMakeLists.txt +++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from tslib.pro. ##################################################################### -## qtslibplugin Plugin: +## QTsLibPlugin Plugin: ##################################################################### -qt_add_plugin(qtslibplugin +qt_add_plugin(QTsLibPlugin + OUTPUT_NAME qtslibplugin TYPE generic - CLASS_NAME QTsLibPlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt index e94f32cc04..54afe0cbe7 100644 --- a/src/plugins/generic/tslib/CMakeLists.txt +++ b/src/plugins/generic/tslib/CMakeLists.txt @@ -3,12 +3,12 @@ qt_find_package(Tslib) # special case ##################################################################### -## qtslibplugin Plugin: +## QTsLibPlugin Plugin: ##################################################################### -qt_add_plugin(qtslibplugin +qt_add_plugin(QTsLibPlugin + OUTPUT_NAME qtslibplugin TYPE generic - CLASS_NAME QTsLibPlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt index 0c577487a0..d17b6dae3a 100644 --- a/src/plugins/generic/tuiotouch/CMakeLists.txt +++ b/src/plugins/generic/tuiotouch/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from tuiotouch.pro. ##################################################################### -## qtuiotouchplugin Plugin: +## QTuioTouchPlugin Plugin: ##################################################################### -qt_add_plugin(qtuiotouchplugin +qt_add_plugin(QTuioTouchPlugin + OUTPUT_NAME qtuiotouchplugin TYPE generic - CLASS_NAME QTuioTouchPlugin SOURCES main.cpp qoscbundle.cpp qoscbundle_p.h 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:<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 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 diff --git a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt index e5cc7cd766..f553093fc5 100644 --- a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from compose.pro. ##################################################################### -## composeplatforminputcontextplugin Plugin: +## QComposePlatformInputContextPlugin Plugin: ##################################################################### -qt_add_plugin(composeplatforminputcontextplugin +qt_add_plugin(QComposePlatformInputContextPlugin + OUTPUT_NAME composeplatforminputcontextplugin TYPE platforminputcontexts - CLASS_NAME QComposePlatformInputContextPlugin SOURCES qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h qcomposeplatforminputcontextmain.cpp diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt index d28722dc3b..21e33432f6 100644 --- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt @@ -1,15 +1,14 @@ # Generated from compose.pro. ##################################################################### -## composeplatforminputcontextplugin Plugin: +## QComposePlatformInputContextPlugin Plugin: ##################################################################### qt_find_package(XKB) # special case pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case - -qt_add_plugin(composeplatforminputcontextplugin +qt_add_plugin(QComposePlatformInputContextPlugin + OUTPUT_NAME composeplatforminputcontextplugin TYPE platforminputcontexts - CLASS_NAME QComposePlatformInputContextPlugin SOURCES qcomposeplatforminputcontext.cpp qcomposeplatforminputcontext.h qcomposeplatforminputcontextmain.cpp diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt index 49f1c79820..a7e3156c9d 100644 --- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from ibus.pro. ##################################################################### -## ibusplatforminputcontextplugin Plugin: +## QIbusPlatformInputContextPlugin Plugin: ##################################################################### -qt_add_plugin(ibusplatforminputcontextplugin +qt_add_plugin(QIbusPlatformInputContextPlugin + OUTPUT_NAME ibusplatforminputcontextplugin TYPE platforminputcontexts - CLASS_NAME QIbusPlatformInputContextPlugin SOURCES main.cpp qibusinputcontextproxy.cpp qibusinputcontextproxy.h diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 62d66746d8..047abff880 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from android.pro. ##################################################################### -## qtforandroid Plugin: +## QAndroidIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qtforandroid +qt_add_plugin(QAndroidIntegrationPlugin + OUTPUT_NAME qtforandroid TYPE platforms - CLASS_NAME QAndroidIntegrationPlugin SOURCES androidcontentfileengine.cpp androidcontentfileengine.h androiddeadlockprotector.cpp androiddeadlockprotector.h @@ -66,7 +66,7 @@ qt_add_plugin(qtforandroid ## Scopes: ##################################################################### -qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h @@ -76,12 +76,12 @@ qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -qt_extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets +qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 406cb54d72..d66fb239d7 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from android.pro. ##################################################################### -## qtforandroid Plugin: +## QAndroidIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qtforandroid +qt_add_plugin(QAndroidIntegrationPlugin + OUTPUT_NAME qtforandroid TYPE platforms - CLASS_NAME QAndroidIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case SOURCES androidcontentfileengine.cpp androidcontentfileengine.h @@ -75,7 +75,7 @@ qt_add_plugin(qtforandroid ## Scopes: ##################################################################### -qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h @@ -85,12 +85,12 @@ qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -qt_extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets +qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index 27fe778f95..d557a510d7 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from cocoa.pro. ##################################################################### -## qcocoa Plugin: +## QCocoaIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qcocoa +qt_add_plugin(QCocoaIntegrationPlugin + OUTPUT_NAME qcocoa TYPE platforms - CLASS_NAME QCocoaIntegrationPlugin SOURCES main.mm messages.cpp messages.h @@ -73,7 +73,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -qt_add_resource(qcocoa "qcocoaresources" +qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -87,12 +87,12 @@ qt_add_resource(qcocoa "qcocoaresources" ## Scopes: ##################################################################### -qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm LIBRARIES @@ -101,7 +101,7 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm @@ -111,12 +111,12 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qcocoasessionmanager.cpp qcocoasessionmanager.h ) -qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h LIBRARIES @@ -128,7 +128,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets #### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" -qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets SOURCES qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm @@ -139,17 +139,17 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets Qt::PrintSupport ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES qcocoafiledialoghelper.h qcocoafiledialoghelper.mm ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets SOURCES qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index dbaea562a8..7ed2a8ffdb 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -4,13 +4,13 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) ##################################################################### -## qcocoa Plugin: +## QCocoaIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qcocoa - TYPE platforms +qt_add_plugin(QCocoaIntegrationPlugin + OUTPUT_NAME qcocoa DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case - CLASS_NAME QCocoaIntegrationPlugin + TYPE platforms SOURCES main.mm messages.cpp messages.h @@ -77,7 +77,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -qt_add_resource(qcocoa "qcocoaresources" +qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -91,12 +91,12 @@ qt_add_resource(qcocoa "qcocoaresources" ## Scopes: ##################################################################### -qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm LIBRARIES @@ -105,7 +105,7 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm @@ -115,12 +115,12 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qcocoasessionmanager.cpp qcocoasessionmanager.h ) -qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h LIBRARIES @@ -132,7 +132,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets #### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" -qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets SOURCES qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm @@ -143,17 +143,17 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets Qt::PrintSupport ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES qcocoafiledialoghelper.h qcocoafiledialoghelper.mm ) -qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets SOURCES qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index 3bfdb81666..b16e7cb9bd 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from directfb.pro. ##################################################################### -## qdirectfb Plugin: +## QDirectFbIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qdirectfb +qt_add_plugin(QDirectFbIntegrationPlugin + OUTPUT_NAME qdirectfb TYPE platforms - CLASS_NAME QDirectFbIntegrationPlugin SOURCES main.cpp qdirectfbbackingstore.cpp qdirectfbbackingstore.h @@ -39,7 +39,7 @@ qt_add_plugin(qdirectfb ## Scopes: ##################################################################### -qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl +qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES @@ -50,7 +50,7 @@ qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl Qt::EglSupport ) -qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -58,7 +58,7 @@ qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -qt_extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt index 5629e79385..b696943257 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -5,12 +5,12 @@ qt_find_package(DirectFB) # end special case: ##################################################################### -## qdirectfb Plugin: +## QDirectFbIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qdirectfb +qt_add_plugin(QDirectFbIntegrationPlugin + OUTPUT_NAME qdirectfb TYPE platforms - CLASS_NAME QDirectFbIntegrationPlugin SOURCES main.cpp qdirectfbbackingstore.cpp qdirectfbbackingstore.h @@ -43,7 +43,7 @@ qt_add_plugin(qdirectfb ## Scopes: ##################################################################### -qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl +qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES @@ -54,7 +54,7 @@ qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl Qt::EglSupport ) -qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -62,7 +62,7 @@ qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -qt_extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index 320ef4f1d8..fa6623ee50 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from eglfs_emu.pro. ##################################################################### -## qeglfs-emu-integration Plugin: +## QEglFSEmulatorIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qeglfs-emu-integration +qt_add_plugin(QEglFSEmulatorIntegrationPlugin + OUTPUT_NAME qeglfs-emu-integration TYPE egldeviceintegrations - CLASS_NAME QEglFSEmulatorIntegrationPlugin SOURCES qeglfsemulatorintegration.cpp qeglfsemulatorintegration.h qeglfsemulatorscreen.cpp qeglfsemulatorscreen.h diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index 656190e7a8..d2a2b9699d 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from eglfs_kms.pro. ##################################################################### -## qeglfs-kms-integration Plugin: +## QEglFSKmsGbmIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qeglfs-kms-integration +qt_add_plugin(QEglFSKmsGbmIntegrationPlugin + OUTPUT_NAME qeglfs-kms-integration TYPE egldeviceintegrations - CLASS_NAME QEglFSKmsGbmIntegrationPlugin SOURCES qeglfskmsgbmcursor.cpp qeglfskmsgbmcursor.h qeglfskmsgbmdevice.cpp qeglfskmsgbmdevice.h diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt index 03a2de61eb..63335ced92 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from eglfs_kms_egldevice.pro. ##################################################################### -## qeglfs-kms-egldevice-integration Plugin: +## QEglFSKmsEglDeviceIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qeglfs-kms-egldevice-integration +qt_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin + OUTPUT_NAME qeglfs-kms-egldevice-integration TYPE egldeviceintegrations - CLASS_NAME QEglFSKmsEglDeviceIntegrationPlugin SOURCES qeglfskmsegldevice.cpp qeglfskmsegldevice.h qeglfskmsegldeviceintegration.cpp qeglfskmsegldeviceintegration.h diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index fc0bb6847f..cad49366c8 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from eglfs_x11.pro. ##################################################################### -## qeglfs-x11-integration Plugin: +## QEglFSX11IntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qeglfs-x11-integration +qt_add_plugin(QEglFSX11IntegrationPlugin + OUTPUT_NAME qeglfs-x11-integration TYPE egldeviceintegrations - CLASS_NAME QEglFSX11IntegrationPlugin SOURCES qeglfsx11integration.cpp qeglfsx11integration.h qeglfsx11main.cpp diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt index 5adac3cabb..0f9128c6f7 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from nsphotolibrarysupport.pro. ##################################################################### -## qiosnsphotolibrarysupport Plugin: +## QIosOptionalPlugin_NSPhotoLibrary Plugin: ##################################################################### -add_qt_plugin(qiosnsphotolibrarysupport +add_qt_plugin(QIosOptionalPlugin_NSPhotoLibrary + OUTPUT_NAME qiosnsphotolibrarysupport TYPE platforms/darwin - CLASS_NAME QIosOptionalPlugin_NSPhotoLibrary SOURCES plugin.mm qiosfileengineassetslibrary.h qiosfileengineassetslibrary.mm diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 76ec42f0ec..0586e393ec 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from linuxfb.pro. ##################################################################### -## qlinuxfb Plugin: +## QLinuxFbIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qlinuxfb +qt_add_plugin(QLinuxFbIntegrationPlugin + OUTPUT_NAME qlinuxfb TYPE platforms - CLASS_NAME QLinuxFbIntegrationPlugin SOURCES main.cpp qlinuxfbintegration.cpp qlinuxfbintegration.h @@ -35,14 +35,14 @@ qt_add_plugin(qlinuxfb ## Scopes: ##################################################################### -qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -qt_extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate +qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h LIBRARIES diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index ac2c216130..b54d4e2c6f 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from linuxfb.pro. ##################################################################### -## qlinuxfb Plugin: +## QLinuxFbIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qlinuxfb +qt_add_plugin(QLinuxFbIntegrationPlugin + OUTPUT_NAME qlinuxfb TYPE platforms - CLASS_NAME QLinuxFbIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case SOURCES main.cpp @@ -36,14 +36,14 @@ qt_add_plugin(qlinuxfb ## Scopes: ##################################################################### -qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -qt_extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate +qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h LIBRARIES diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index 3ceb3e9ef1..e8fb16fdb0 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from minimal.pro. ##################################################################### -## qminimal Plugin: +## QMinimalIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qminimal +qt_add_plugin(QMinimalIntegrationPlugin + OUTPUT_NAME qminimal TYPE platforms - CLASS_NAME QMinimalIntegrationPlugin SOURCES main.cpp qminimalbackingstore.cpp qminimalbackingstore.h @@ -31,7 +31,7 @@ qt_add_plugin(qminimal ## Scopes: ##################################################################### -qt_extend_target(qminimal CONDITION QT_FEATURE_freetype +qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 5a6307889b..acc097c4c8 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from minimal.pro. ##################################################################### -## qminimal Plugin: +## QMinimalIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qminimal +qt_add_plugin(QMinimalIntegrationPlugin + OUTPUT_NAME qminimal TYPE platforms - CLASS_NAME QMinimalIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case SOURCES main.cpp @@ -32,7 +32,7 @@ qt_add_plugin(qminimal ## Scopes: ##################################################################### -qt_extend_target(qminimal CONDITION QT_FEATURE_freetype +qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt index ab797ea67d..c7bf3f7c7c 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from minimalegl.pro. ##################################################################### -## qminimalegl Plugin: +## QMinimalEglIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qminimalegl +qt_add_plugin(QMinimalEglIntegrationPlugin + OUTPUT_NAME qminimalegl TYPE platforms - CLASS_NAME QMinimalEglIntegrationPlugin SOURCES main.cpp qminimaleglintegration.cpp qminimaleglintegration.h @@ -34,7 +34,7 @@ qt_add_plugin(qminimalegl ## Scopes: ##################################################################### -qt_extend_target(qminimalegl CONDITION QT_FEATURE_opengl +qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h ) diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 0d925fed68..7c549a416b 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from minimalegl.pro. ##################################################################### -## qminimalegl Plugin: +## QMinimalEglIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qminimalegl +qt_add_plugin(QMinimalEglIntegrationPlugin + OUTPUT_NAME qminimalegl TYPE platforms - CLASS_NAME QMinimalEglIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case SOURCES main.cpp @@ -35,7 +35,7 @@ qt_add_plugin(qminimalegl ## Scopes: ##################################################################### -qt_extend_target(qminimalegl CONDITION QT_FEATURE_opengl +qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h ) diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 3980ab62f8..b3fca1bd47 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from offscreen.pro. ##################################################################### -## qoffscreen Plugin: +## QOffscreenIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qoffscreen +qt_add_plugin(QOffscreenIntegrationPlugin + OUTPUT_NAME qoffscreen TYPE platforms - CLASS_NAME QOffscreenIntegrationPlugin SOURCES main.cpp qoffscreencommon.cpp qoffscreencommon.h @@ -32,7 +32,7 @@ qt_add_plugin(qoffscreen ## Scopes: ##################################################################### -qt_extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h LIBRARIES diff --git a/src/plugins/platforms/offscreen/CMakeLists.txt b/src/plugins/platforms/offscreen/CMakeLists.txt index 03576b898e..971f4c888d 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from offscreen.pro. ##################################################################### -## qoffscreen Plugin: +## QOffscreenIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qoffscreen +qt_add_plugin(QOffscreenIntegrationPlugin + OUTPUT_NAME qoffscreen TYPE platforms - CLASS_NAME QOffscreenIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case SOURCES main.cpp @@ -33,7 +33,7 @@ qt_add_plugin(qoffscreen ## Scopes: ##################################################################### -qt_extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 SOURCES qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h LIBRARIES diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt index 276730755a..28031bb7d1 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from vnc.pro. ##################################################################### -## qvnc Plugin: +## QVncIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qvnc +qt_add_plugin(QVncIntegrationPlugin + OUTPUT_NAME qvnc TYPE platforms - CLASS_NAME QVncIntegrationPlugin SOURCES main.cpp qvnc.cpp qvnc_p.h @@ -40,7 +40,7 @@ qt_add_plugin(qvnc ## Scopes: ##################################################################### -qt_extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index 0b5295287b..502cff06db 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from vnc.pro. ##################################################################### -## qvnc Plugin: +## QVncIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qvnc +qt_add_plugin(QVncIntegrationPlugin + OUTPUT_NAME qvnc TYPE platforms - CLASS_NAME QVncIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case SOURCES main.cpp @@ -41,7 +41,7 @@ qt_add_plugin(qvnc ## Scopes: ##################################################################### -qt_extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index a23b1643de..fcac46588d 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from windows.pro. ##################################################################### -## qwindows Plugin: +## QWindowsIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwindows +qt_add_plugin(QWindowsIntegrationPlugin + OUTPUT_NAME qwindows TYPE platforms - CLASS_NAME QWindowsIntegrationPlugin SOURCES main.cpp qtwindowsglobal.h @@ -75,7 +75,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -qt_add_resource(qwindows "openglblacklists" +qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -89,7 +89,7 @@ qt_add_resource(qwindows "openglblacklists" ## Scopes: ##################################################################### -qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -115,7 +115,7 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h LIBRARIES @@ -127,59 +127,59 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 PUBLIC_LIBRARIES opengl32 ) -qt_extend_target(qwindows CONDITION mingw +qt_extend_target(QWindowsIntegrationPlugin CONDITION mingw PUBLIC_LIBRARIES uuid ) -qt_extend_target(qwindows CONDITION QT_FEATURE_opengl +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qwindowsopenglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2 +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengles2 SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES qwindowsglcontext.cpp qwindowsglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_dynamicgl SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -210,7 +210,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - qt_add_resource(qwindows "cursors" + qt_add_resource(QWindowsIntegrationPlugin "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -218,25 +218,25 @@ if(QT_FEATURE_imageformat_png) ) endif() -qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate LIBRARIES Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES Qt::WindowsUIAutomationSupport ) -qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw PUBLIC_LIBRARIES uuid ) -qt_extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_combined_angle_lib DEFINES LIBEGL_NAME= LIBGLESV2_NAME= ) -qt_extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib +qt_extend_target(QWindowsIntegrationPlugin CONDITION NOT QT_FEATURE_combined_angle_lib DEFINES LIBEGL_NAME= LIBGLESV2_NAME= diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 7b07bcf5de..1c017ed2e5 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from windows.pro. ##################################################################### -## qwindows Plugin: +## QWindowsIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qwindows +qt_add_plugin(QWindowsIntegrationPlugin + OUTPUT_NAME qwindows TYPE platforms - CLASS_NAME QWindowsIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case SOURCES main.cpp @@ -76,7 +76,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -qt_add_resource(qwindows "openglblacklists" +qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -90,7 +90,7 @@ qt_add_resource(qwindows "openglblacklists" ## Scopes: ##################################################################### -qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -116,7 +116,7 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h LIBRARIES @@ -128,59 +128,59 @@ qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 PUBLIC_LIBRARIES opengl32 ) -qt_extend_target(qwindows CONDITION mingw +qt_extend_target(QWindowsIntegrationPlugin CONDITION mingw PUBLIC_LIBRARIES uuid ) -qt_extend_target(qwindows CONDITION QT_FEATURE_opengl +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qwindowsopenglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2 +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengles2 SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES qwindowsglcontext.cpp qwindowsglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_dynamicgl SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -211,7 +211,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - qt_add_resource(qwindows "cursors" + qt_add_resource(QWindowsIntegrationPlugin "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -219,19 +219,19 @@ if(QT_FEATURE_imageformat_png) ) endif() -qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate LIBRARIES Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES Qt::WindowsUIAutomationSupport ) -qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility AND mingw PUBLIC_LIBRARIES uuid ) # special case: -# extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib ... -# extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib ... +# qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_combined_angle_lib ... +# qt_extend_target(QWindowsIntegrationPlugin CONDITION NOT QT_FEATURE_combined_angle_lib ... diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt index 1d1833450b..14d91295aa 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcb_egl.pro. ##################################################################### -## qxcb-egl-integration Plugin: +## QXcbEglIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qxcb-egl-integration +qt_add_plugin(QXcbEglIntegrationPlugin + OUTPUT_NAME qxcb-egl-integration TYPE xcbglintegrations - CLASS_NAME QXcbEglIntegrationPlugin SOURCES qxcbeglcontext.h qxcbeglintegration.cpp qxcbeglintegration.h diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index dfb74d7138..494392ad1a 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xcb_glx.pro. ##################################################################### -## qxcb-glx-integration Plugin: +## QXcbGlxIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qxcb-glx-integration +qt_add_plugin(QXcbGlxIntegrationPlugin + OUTPUT_NAME qxcb-glx-integration TYPE xcbglintegrations - CLASS_NAME QXcbGlxIntegrationPlugin SOURCES qglxintegration.cpp qglxintegration.h qxcbglxintegration.cpp qxcbglxintegration.h @@ -33,12 +33,12 @@ qt_add_plugin(qxcb-glx-integration ## Scopes: ##################################################################### -qt_extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx +qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx PUBLIC_LIBRARIES XCB::GLX ) -qt_extend_target(qxcb-glx-integration CONDITION QT_FEATURE_dlopen AND NOT static +qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) diff --git a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt index de76f45c26..d5cfb31507 100644 --- a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from gtk3.pro. ##################################################################### -## qgtk3 Plugin: +## QGtk3ThemePlugin Plugin: ##################################################################### -qt_add_plugin(qgtk3 +qt_add_plugin(QGtk3ThemePlugin + OUTPUT_NAME qgtk3 TYPE platformthemes - CLASS_NAME QGtk3ThemePlugin SOURCES main.cpp qgtk3dialoghelpers.cpp qgtk3dialoghelpers.h diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt index f467f48a9d..9b1ed2242e 100644 --- a/src/plugins/platformthemes/gtk3/CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt @@ -4,12 +4,12 @@ qt_find_package(GTK3) # special case qt_find_package(X11) # special case ##################################################################### -## qgtk3 Plugin: +## QGtk3ThemePlugin Plugin: ##################################################################### -qt_add_plugin(qgtk3 +qt_add_plugin(QGtk3ThemePlugin + OUTPUT_NAME qgtk3 TYPE platformthemes - CLASS_NAME QGtk3ThemePlugin SOURCES main.cpp qgtk3dialoghelpers.cpp qgtk3dialoghelpers.h diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index 6939c8d9e4..f41e041729 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from xdgdesktopportal.pro. ##################################################################### -## qxdgdesktopportal Plugin: +## QXdgDesktopPortalThemePlugin Plugin: ##################################################################### -qt_add_plugin(qxdgdesktopportal +qt_add_plugin(QXdgDesktopPortalThemePlugin + OUTPUT_NAME qxdgdesktopportal TYPE platformthemes - CLASS_NAME QXdgDesktopPortalThemePlugin SOURCES main.cpp qxdgdesktopportalfiledialog.cpp qxdgdesktopportalfiledialog_p.h diff --git a/src/plugins/printsupport/cocoa/CMakeLists.txt b/src/plugins/printsupport/cocoa/CMakeLists.txt index c8de1e76f6..3821150fdc 100644 --- a/src/plugins/printsupport/cocoa/CMakeLists.txt +++ b/src/plugins/printsupport/cocoa/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from cocoa.pro. ##################################################################### -## cocoaprintersupport Plugin: +## QCocoaPrinterSupportPlugin Plugin: ##################################################################### -qt_add_plugin(cocoaprintersupport +qt_add_plugin(QCocoaPrinterSupportPlugin + OUTPUT_NAME cocoaprintersupport TYPE printsupport - CLASS_NAME QCocoaPrinterSupportPlugin SOURCES main.cpp LIBRARIES diff --git a/src/plugins/printsupport/cups/.prev_CMakeLists.txt b/src/plugins/printsupport/cups/.prev_CMakeLists.txt index bbf8a60b3f..9967b8138e 100644 --- a/src/plugins/printsupport/cups/.prev_CMakeLists.txt +++ b/src/plugins/printsupport/cups/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from cups.pro. ##################################################################### -## cupsprintersupport Plugin: +## QCupsPrinterSupportPlugin Plugin: ##################################################################### -qt_add_plugin(cupsprintersupport +qt_add_plugin(QCupsPrinterSupportPlugin + OUTPUT_NAME cupsprintersupport TYPE printsupport - CLASS_NAME QCupsPrinterSupportPlugin SOURCES main.cpp qcupsprintengine.cpp qcupsprintengine_p.h diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt index 6fc4efc941..deba344c54 100644 --- a/src/plugins/printsupport/cups/CMakeLists.txt +++ b/src/plugins/printsupport/cups/CMakeLists.txt @@ -3,12 +3,12 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case ##################################################################### -## cupsprintersupport Plugin: +## QCupsPrinterSupportPlugin Plugin: ##################################################################### -qt_add_plugin(cupsprintersupport +qt_add_plugin(QCupsPrinterSupportPlugin + OUTPUT_NAME cupsprintersupport TYPE printsupport - CLASS_NAME QCupsPrinterSupportPlugin SOURCES main.cpp qcupsprintengine.cpp qcupsprintengine_p.h diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index d3d46bebbb..a75d28e19d 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from db2.pro. ##################################################################### -## qsqldb2 Plugin: +## QDB2DriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqldb2 +qt_add_plugin(QDB2DriverPlugin + OUTPUT_NAME qsqldb2 TYPE sqldrivers - CLASS_NAME QDB2DriverPlugin SOURCES main.cpp qsql_db2.cpp qsql_db2_p.h @@ -28,7 +28,7 @@ qt_add_plugin(qsqldb2 ## Scopes: ##################################################################### -qt_extend_target(qsqldb2 CONDITION (TEST_architecture_arch STREQUAL "x86_64") +qt_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64") DEFINES ODBC64 ) diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt index e55a062c9b..7a55786300 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from mysql.pro. ##################################################################### -## qsqlmysql Plugin: +## QMYSQLDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlmysql +qt_add_plugin(QMYSQLDriverPlugin + OUTPUT_NAME qsqlmysql TYPE sqldrivers - CLASS_NAME QMYSQLDriverPlugin SOURCES main.cpp qsql_mysql.cpp qsql_mysql_p.h diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index 3215b87c46..d3c1d0c74c 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from oci.pro. ##################################################################### -## qsqloci Plugin: +## QOCIDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqloci +qt_add_plugin(QOCIDriverPlugin + OUTPUT_NAME qsqloci TYPE sqldrivers - CLASS_NAME QOCIDriverPlugin SOURCES main.cpp qsql_oci.cpp qsql_oci_p.h @@ -28,7 +28,7 @@ qt_add_plugin(qsqloci ## Scopes: ##################################################################### -qt_extend_target(qsqloci CONDITION APPLE +qt_extend_target(QOCIDriverPlugin CONDITION APPLE LINK_OPTIONS "-Wl,-flat_namespace,-U,_environ" ) diff --git a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt index 5eda5899cf..2452d50989 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from odbc.pro. ##################################################################### -## qsqlodbc Plugin: +## QODBCDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlodbc +qt_add_plugin(QODBCDriverPlugin + OUTPUT_NAME qsqlodbc TYPE sqldrivers - CLASS_NAME QODBCDriverPlugin SOURCES main.cpp qsql_odbc.cpp qsql_odbc_p.h @@ -28,7 +28,7 @@ qt_add_plugin(qsqlodbc ## Scopes: ##################################################################### -qt_extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(QODBCDriverPlugin CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 871e87a4c1..0e19306786 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -1,14 +1,13 @@ # Generated from odbc.pro. ##################################################################### -## qsqlodbc Plugin: +## QODBCDriverPlugin Plugin: ##################################################################### qt_find_package(ODBC) # special case - -qt_add_plugin(qsqlodbc +qt_add_plugin(QODBCDriverPlugin + OUTPUT_NAME qsqlodbc TYPE sqldrivers - CLASS_NAME QODBCDriverPlugin SOURCES main.cpp qsql_odbc.cpp qsql_odbc_p.h @@ -30,7 +29,7 @@ qt_add_plugin(qsqlodbc ## Scopes: ##################################################################### -qt_extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(QODBCDriverPlugin CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt index 4047c6b1f6..7df66eeb51 100644 --- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from psql.pro. ##################################################################### -## qsqlpsql Plugin: +## QPSQLDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlpsql +qt_add_plugin(QPSQLDriverPlugin + OUTPUT_NAME qsqlpsql TYPE sqldrivers - CLASS_NAME QPSQLDriverPlugin SOURCES main.cpp qsql_psql.cpp qsql_psql_p.h diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index 46ad12677e..e4f794f523 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -6,12 +6,12 @@ qt_find_package(PostgreSQL) # special case ##################################################################### -## qsqlpsql Plugin: +## QPSQLDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlpsql +qt_add_plugin(QPSQLDriverPlugin + OUTPUT_NAME qsqlpsql TYPE sqldrivers - CLASS_NAME QPSQLDriverPlugin SOURCES main.cpp qsql_psql.cpp qsql_psql_p.h diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index ae08f26cb9..6e17dfe302 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from sqlite.pro. ##################################################################### -## qsqlite Plugin: +## QSQLiteDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlite +qt_add_plugin(QSQLiteDriverPlugin + OUTPUT_NAME qsqlite TYPE sqldrivers - CLASS_NAME QSQLiteDriverPlugin SOURCES qsql_sqlite.cpp qsql_sqlite_p.h smain.cpp @@ -28,12 +28,12 @@ qt_add_plugin(qsqlite ## Scopes: ##################################################################### -qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES sqlite ) -qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -48,22 +48,22 @@ qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -qt_extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -qt_extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -qt_extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION WINRT AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OS_WINRT ) @@ -71,22 +71,22 @@ qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite #### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: # QMAKE_CFLAGS = "-Gy" -qt_extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone +qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone DEFINES HAVE_USLEEP=1 ) -qt_extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OMIT_LOAD_EXTENSION ) diff --git a/src/plugins/sqldrivers/sqlite/CMakeLists.txt b/src/plugins/sqldrivers/sqlite/CMakeLists.txt index 35fe8e69de..98c94a426a 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from sqlite.pro. ##################################################################### -## qsqlite Plugin: +## QSQLiteDriverPlugin Plugin: ##################################################################### -qt_add_plugin(qsqlite +qt_add_plugin(QSQLiteDriverPlugin + OUTPUT_NAME 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 89b9594ebe..6b039c0ddc 100644 --- a/src/plugins/styles/mac/CMakeLists.txt +++ b/src/plugins/styles/mac/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from mac.pro. ##################################################################### -## qmacstyle Plugin: +## QMacStylePlugin Plugin: ##################################################################### -qt_add_plugin(qmacstyle +qt_add_plugin(QMacStylePlugin + OUTPUT_NAME qmacstyle TYPE styles - CLASS_NAME QMacStylePlugin SOURCES main.mm qmacstyle_mac.mm qmacstyle_mac_p.h diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt index 3304150c3e..4030344f06 100644 --- a/src/plugins/styles/windowsvista/CMakeLists.txt +++ b/src/plugins/styles/windowsvista/CMakeLists.txt @@ -1,12 +1,12 @@ # Generated from windowsvista.pro. ##################################################################### -## qwindowsvistastyle Plugin: +## QWindowsVistaStylePlugin Plugin: ##################################################################### -qt_add_plugin(qwindowsvistastyle +qt_add_plugin(QWindowsVistaStylePlugin + OUTPUT_NAME qwindowsvistastyle TYPE styles - CLASS_NAME QWindowsVistaStylePlugin SOURCES main.cpp qwindowsvistastyle.cpp qwindowsvistastyle_p.h |