diff options
Diffstat (limited to 'src/plugins')
66 files changed, 181 insertions, 180 deletions
diff --git a/src/plugins/bearer/android/src/CMakeLists.txt b/src/plugins/bearer/android/src/CMakeLists.txt index 28beab0bbd..8aee553d86 100644 --- a/src/plugins/bearer/android/src/CMakeLists.txt +++ b/src/plugins/bearer/android/src/CMakeLists.txt @@ -4,7 +4,7 @@ ## qandroidbearer Plugin: ##################################################################### -add_qt_plugin(qandroidbearer +qt_add_plugin(qandroidbearer TYPE bearer CLASS_NAME QAndroidBearerEnginePlugin SOURCES diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index c1940a1e16..d753919a2b 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qconnmanbearer Plugin: ##################################################################### -add_qt_plugin(qconnmanbearer +qt_add_plugin(qconnmanbearer TYPE bearer CLASS_NAME QConnmanEnginePlugin SOURCES diff --git a/src/plugins/bearer/connman/CMakeLists.txt b/src/plugins/bearer/connman/CMakeLists.txt index af2a599cb0..1ad024806b 100644 --- a/src/plugins/bearer/connman/CMakeLists.txt +++ b/src/plugins/bearer/connman/CMakeLists.txt @@ -4,7 +4,7 @@ ## qconnmanbearer Plugin: ##################################################################### -add_qt_plugin(qconnmanbearer +qt_add_plugin(qconnmanbearer TYPE bearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QConnmanEnginePlugin diff --git a/src/plugins/bearer/corewlan/CMakeLists.txt b/src/plugins/bearer/corewlan/CMakeLists.txt index f42f9cfb52..914f5ceae1 100644 --- a/src/plugins/bearer/corewlan/CMakeLists.txt +++ b/src/plugins/bearer/corewlan/CMakeLists.txt @@ -4,7 +4,7 @@ ## qcorewlanbearer Plugin: ##################################################################### -add_qt_plugin(qcorewlanbearer +qt_add_plugin(qcorewlanbearer TYPE bearer CLASS_NAME QCoreWlanEnginePlugin SOURCES @@ -26,7 +26,7 @@ add_qt_plugin(qcorewlanbearer ## Scopes: ##################################################################### -extend_target(qcorewlanbearer CONDITION QT_FEATURE_corewlan +qt_extend_target(qcorewlanbearer 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 9f02d5cd7f..c41688e82a 100644 --- a/src/plugins/bearer/generic/CMakeLists.txt +++ b/src/plugins/bearer/generic/CMakeLists.txt @@ -4,7 +4,7 @@ ## qgenericbearer Plugin: ##################################################################### -add_qt_plugin(qgenericbearer +qt_add_plugin(qgenericbearer TYPE bearer CLASS_NAME QGenericEnginePlugin SOURCES @@ -25,7 +25,7 @@ add_qt_plugin(qgenericbearer ## Scopes: ##################################################################### -extend_target(qgenericbearer CONDITION WIN32 AND NOT WINRT +qt_extend_target(qgenericbearer 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 f0748bebde..993e4d7900 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qnmbearer Plugin: ##################################################################### -add_qt_plugin(qnmbearer +qt_add_plugin(qnmbearer TYPE bearer CLASS_NAME QNetworkManagerEnginePlugin SOURCES diff --git a/src/plugins/bearer/networkmanager/CMakeLists.txt b/src/plugins/bearer/networkmanager/CMakeLists.txt index bbb1650140..a6fb609e9d 100644 --- a/src/plugins/bearer/networkmanager/CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/CMakeLists.txt @@ -4,7 +4,7 @@ ## qnmbearer Plugin: ##################################################################### -add_qt_plugin(qnmbearer +qt_add_plugin(qnmbearer TYPE bearer DEFAULT_IF False # special case QTBUG-78164 CLASS_NAME QNetworkManagerEnginePlugin diff --git a/src/plugins/generic/evdevkeyboard/CMakeLists.txt b/src/plugins/generic/evdevkeyboard/CMakeLists.txt index 2466339d83..e8adbd6d51 100644 --- a/src/plugins/generic/evdevkeyboard/CMakeLists.txt +++ b/src/plugins/generic/evdevkeyboard/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevkeyboardplugin Plugin: ##################################################################### -add_qt_plugin(qevdevkeyboardplugin +qt_add_plugin(qevdevkeyboardplugin TYPE generic CLASS_NAME QEvdevKeyboardPlugin SOURCES diff --git a/src/plugins/generic/evdevmouse/CMakeLists.txt b/src/plugins/generic/evdevmouse/CMakeLists.txt index e65ca7d717..fc6b3d30c2 100644 --- a/src/plugins/generic/evdevmouse/CMakeLists.txt +++ b/src/plugins/generic/evdevmouse/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevmouseplugin Plugin: ##################################################################### -add_qt_plugin(qevdevmouseplugin +qt_add_plugin(qevdevmouseplugin TYPE generic CLASS_NAME QEvdevMousePlugin SOURCES diff --git a/src/plugins/generic/evdevtablet/CMakeLists.txt b/src/plugins/generic/evdevtablet/CMakeLists.txt index 4d463fa929..1479a2f66b 100644 --- a/src/plugins/generic/evdevtablet/CMakeLists.txt +++ b/src/plugins/generic/evdevtablet/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevtabletplugin Plugin: ##################################################################### -add_qt_plugin(qevdevtabletplugin +qt_add_plugin(qevdevtabletplugin TYPE generic CLASS_NAME QEvdevTabletPlugin SOURCES diff --git a/src/plugins/generic/evdevtouch/CMakeLists.txt b/src/plugins/generic/evdevtouch/CMakeLists.txt index 616759f49d..79e11d7969 100644 --- a/src/plugins/generic/evdevtouch/CMakeLists.txt +++ b/src/plugins/generic/evdevtouch/CMakeLists.txt @@ -4,7 +4,7 @@ ## qevdevtouchplugin Plugin: ##################################################################### -add_qt_plugin(qevdevtouchplugin +qt_add_plugin(qevdevtouchplugin TYPE generic CLASS_NAME QEvdevTouchScreenPlugin SOURCES diff --git a/src/plugins/generic/libinput/CMakeLists.txt b/src/plugins/generic/libinput/CMakeLists.txt index 1b07b0926c..d0a60938cd 100644 --- a/src/plugins/generic/libinput/CMakeLists.txt +++ b/src/plugins/generic/libinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlibinputplugin Plugin: ##################################################################### -add_qt_plugin(qlibinputplugin +qt_add_plugin(qlibinputplugin TYPE generic CLASS_NAME QLibInputPlugin SOURCES diff --git a/src/plugins/generic/tslib/.prev_CMakeLists.txt b/src/plugins/generic/tslib/.prev_CMakeLists.txt index 7663c67a6d..fe71451ae4 100644 --- a/src/plugins/generic/tslib/.prev_CMakeLists.txt +++ b/src/plugins/generic/tslib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtslibplugin Plugin: ##################################################################### -add_qt_plugin(qtslibplugin +qt_add_plugin(qtslibplugin TYPE generic CLASS_NAME QTsLibPlugin SOURCES diff --git a/src/plugins/generic/tslib/CMakeLists.txt b/src/plugins/generic/tslib/CMakeLists.txt index 2a26fcc2b3..e94f32cc04 100644 --- a/src/plugins/generic/tslib/CMakeLists.txt +++ b/src/plugins/generic/tslib/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(Tslib) # special case ## qtslibplugin Plugin: ##################################################################### -add_qt_plugin(qtslibplugin +qt_add_plugin(qtslibplugin TYPE generic CLASS_NAME QTsLibPlugin SOURCES diff --git a/src/plugins/generic/tuiotouch/CMakeLists.txt b/src/plugins/generic/tuiotouch/CMakeLists.txt index 2c7aa4fc90..0c577487a0 100644 --- a/src/plugins/generic/tuiotouch/CMakeLists.txt +++ b/src/plugins/generic/tuiotouch/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtuiotouchplugin Plugin: ##################################################################### -add_qt_plugin(qtuiotouchplugin +qt_add_plugin(qtuiotouchplugin TYPE generic CLASS_NAME QTuioTouchPlugin SOURCES diff --git a/src/plugins/imageformats/gif/.prev_CMakeLists.txt b/src/plugins/imageformats/gif/.prev_CMakeLists.txt index 19c1d678c2..0dcdf2954d 100644 --- a/src/plugins/imageformats/gif/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/gif/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qgif Plugin: ##################################################################### -add_qt_plugin(qgif +qt_add_plugin(qgif TYPE imageformats CLASS_NAME QGifPlugin SOURCES diff --git a/src/plugins/imageformats/gif/CMakeLists.txt b/src/plugins/imageformats/gif/CMakeLists.txt index f3642a62e0..0255212201 100644 --- a/src/plugins/imageformats/gif/CMakeLists.txt +++ b/src/plugins/imageformats/gif/CMakeLists.txt @@ -4,7 +4,7 @@ ## qgif Plugin: ##################################################################### -add_qt_plugin(qgif +qt_add_plugin(qgif TYPE imageformats CLASS_NAME QGifPlugin SOURCES diff --git a/src/plugins/imageformats/ico/CMakeLists.txt b/src/plugins/imageformats/ico/CMakeLists.txt index 93d2f26bfe..a07eb59655 100644 --- a/src/plugins/imageformats/ico/CMakeLists.txt +++ b/src/plugins/imageformats/ico/CMakeLists.txt @@ -4,7 +4,7 @@ ## qico Plugin: ##################################################################### -add_qt_plugin(qico +qt_add_plugin(qico TYPE imageformats CLASS_NAME QICOPlugin SOURCES diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index ed3d7892fd..53239e923f 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qjpeg Plugin: ##################################################################### -add_qt_plugin(qjpeg +qt_add_plugin(qjpeg TYPE imageformats CLASS_NAME QJpegPlugin SOURCES diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index d4ccf1e584..b6a7c73ea6 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(JPEG) # special case ## qjpeg Plugin: ##################################################################### -add_qt_plugin(qjpeg +qt_add_plugin(qjpeg TYPE imageformats CLASS_NAME QJpegPlugin SOURCES diff --git a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt index 1e416554af..e5cc7cd766 100644 --- a/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## composeplatforminputcontextplugin Plugin: ##################################################################### -add_qt_plugin(composeplatforminputcontextplugin +qt_add_plugin(composeplatforminputcontextplugin TYPE platforminputcontexts CLASS_NAME QComposePlatformInputContextPlugin SOURCES diff --git a/src/plugins/platforminputcontexts/compose/CMakeLists.txt b/src/plugins/platforminputcontexts/compose/CMakeLists.txt index b1ba1d811e..d28722dc3b 100644 --- a/src/plugins/platforminputcontexts/compose/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/compose/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(XKB) # special case pkg_get_variable(PKG_X11_PREFIX x11 prefix) # special case -add_qt_plugin(composeplatforminputcontextplugin +qt_add_plugin(composeplatforminputcontextplugin TYPE platforminputcontexts CLASS_NAME QComposePlatformInputContextPlugin SOURCES diff --git a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt index 49bdc448d8..49f1c79820 100644 --- a/src/plugins/platforminputcontexts/ibus/CMakeLists.txt +++ b/src/plugins/platforminputcontexts/ibus/CMakeLists.txt @@ -4,7 +4,7 @@ ## ibusplatforminputcontextplugin Plugin: ##################################################################### -add_qt_plugin(ibusplatforminputcontextplugin +qt_add_plugin(ibusplatforminputcontextplugin TYPE platforminputcontexts CLASS_NAME QIbusPlatformInputContextPlugin SOURCES diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 5c825c6b34..62d66746d8 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qtforandroid Plugin: ##################################################################### -add_qt_plugin(qtforandroid +qt_add_plugin(qtforandroid TYPE platforms CLASS_NAME QAndroidIntegrationPlugin SOURCES @@ -66,7 +66,7 @@ add_qt_plugin(qtforandroid ## Scopes: ##################################################################### -extend_target(qtforandroid CONDITION QT_FEATURE_vulkan +qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h @@ -76,12 +76,12 @@ extend_target(qtforandroid CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid 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 536bb2635f..406cb54d72 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtforandroid Plugin: ##################################################################### -add_qt_plugin(qtforandroid +qt_add_plugin(qtforandroid TYPE platforms CLASS_NAME QAndroidIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case @@ -75,7 +75,7 @@ add_qt_plugin(qtforandroid ## Scopes: ##################################################################### -extend_target(qtforandroid CONDITION QT_FEATURE_vulkan +qt_extend_target(qtforandroid CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h @@ -85,12 +85,12 @@ extend_target(qtforandroid CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets +qt_extend_target(qtforandroid 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 d9d0dd7509..b590c4fb98 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qcocoa Plugin: ##################################################################### -add_qt_plugin(qcocoa +qt_add_plugin(qcocoa TYPE platforms CLASS_NAME QCocoaIntegrationPlugin SOURCES @@ -74,7 +74,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -add_qt_resource(qcocoa "qcocoaresources" +qt_add_resource(qcocoa "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -88,12 +88,12 @@ add_qt_resource(qcocoa "qcocoaresources" ## Scopes: ##################################################################### -extend_target(qcocoa CONDITION QT_FEATURE_opengl +qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_vulkan +qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm LIBRARIES @@ -102,7 +102,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_accessibility +qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm @@ -112,7 +112,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qcocoa CONDITION TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h LIBRARIES @@ -124,7 +124,7 @@ extend_target(qcocoa CONDITION TARGET Qt::Widgets #### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" -extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets SOURCES qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm @@ -135,17 +135,17 @@ extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets Qt::PrintSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES qcocoafiledialoghelper.h qcocoafiledialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa 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 68ae238334..0c76f99790 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) ## qcocoa Plugin: ##################################################################### -add_qt_plugin(qcocoa +qt_add_plugin(qcocoa TYPE platforms DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES cocoa # special case CLASS_NAME QCocoaIntegrationPlugin @@ -78,7 +78,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -add_qt_resource(qcocoa "qcocoaresources" +qt_add_resource(qcocoa "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -92,12 +92,12 @@ add_qt_resource(qcocoa "qcocoaresources" ## Scopes: ##################################################################### -extend_target(qcocoa CONDITION QT_FEATURE_opengl +qt_extend_target(qcocoa CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_vulkan +qt_extend_target(qcocoa CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm LIBRARIES @@ -106,7 +106,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_accessibility +qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm @@ -116,7 +116,7 @@ extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qcocoa CONDITION TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h LIBRARIES @@ -128,7 +128,7 @@ extend_target(qcocoa CONDITION TARGET Qt::Widgets #### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" -extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets SOURCES qcocoaprintdevice.h qcocoaprintdevice.mm qcocoaprintersupport.h qcocoaprintersupport.mm @@ -139,17 +139,17 @@ extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets Qt::PrintSupport ) -extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets SOURCES qcocoacolordialoghelper.h qcocoacolordialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets SOURCES qcocoafiledialoghelper.h qcocoafiledialoghelper.mm ) -extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets +qt_extend_target(qcocoa 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 6ac3ff6936..3bfdb81666 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdirectfb Plugin: ##################################################################### -add_qt_plugin(qdirectfb +qt_add_plugin(qdirectfb TYPE platforms CLASS_NAME QDirectFbIntegrationPlugin SOURCES @@ -39,7 +39,7 @@ add_qt_plugin(qdirectfb ## Scopes: ##################################################################### -extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl +qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES @@ -50,7 +50,7 @@ extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl Qt::EglSupport ) -extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -58,7 +58,7 @@ 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" -extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb 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 2887ece53d..5629e79385 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -8,7 +8,7 @@ qt_find_package(DirectFB) ## qdirectfb Plugin: ##################################################################### -add_qt_plugin(qdirectfb +qt_add_plugin(qdirectfb TYPE platforms CLASS_NAME QDirectFbIntegrationPlugin SOURCES @@ -43,7 +43,7 @@ add_qt_plugin(qdirectfb ## Scopes: ##################################################################### -extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl +qt_extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES @@ -54,7 +54,7 @@ extend_target(qdirectfb CONDITION QT_CONFIG___contains___directfb_egl Qt::EglSupport ) -extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -62,7 +62,7 @@ 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" -extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(qdirectfb CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 8a3c77a5ac..2dde32b0f3 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -5,7 +5,7 @@ qt_find_package(EGL) # special case ## EglFSDeviceIntegration Module: ##################################################################### -add_qt_module(EglFSDeviceIntegration +qt_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -40,14 +40,14 @@ add_qt_module(EglFSDeviceIntegration ## Scopes: ##################################################################### -extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate LIBRARIES Qt::PlatformCompositorSupportPrivate PUBLIC_LIBRARIES @@ -65,7 +65,7 @@ if(QT_FEATURE_cursor) # special case "cursor.json" ) - add_qt_resource(EglFSDeviceIntegration "cursor" + qt_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -73,7 +73,7 @@ if(QT_FEATURE_cursor) # special case ) endif() -extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h @@ -82,7 +82,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl ## qeglfs Plugin: ##################################################################### -add_qt_plugin(qeglfs +qt_add_plugin(qeglfs TYPE platforms CLASS_NAME QEglFSIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index ebab7d35c3..320ef4f1d8 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-emu-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-emu-integration +qt_add_plugin(qeglfs-emu-integration TYPE egldeviceintegrations CLASS_NAME QEglFSEmulatorIntegrationPlugin SOURCES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index a8219604f1..656190e7a8 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-kms-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-kms-integration +qt_add_plugin(qeglfs-kms-integration TYPE egldeviceintegrations CLASS_NAME QEglFSKmsGbmIntegrationPlugin SOURCES 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 08040e1c69..03a2de61eb 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-kms-egldevice-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-kms-egldevice-integration +qt_add_plugin(qeglfs-kms-egldevice-integration TYPE egldeviceintegrations CLASS_NAME QEglFSKmsEglDeviceIntegrationPlugin SOURCES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt index 1a7a12eb90..2e8819182c 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFsKmsSupport Module: ##################################################################### -add_qt_module(EglFsKmsSupport +qt_add_module(EglFsKmsSupport INTERNAL_MODULE NO_MODULE_HEADERS SOURCES diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index d358d5c5c7..fc0bb6847f 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -4,7 +4,7 @@ ## qeglfs-x11-integration Plugin: ##################################################################### -add_qt_plugin(qeglfs-x11-integration +qt_add_plugin(qeglfs-x11-integration TYPE egldeviceintegrations CLASS_NAME QEglFSX11IntegrationPlugin SOURCES diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 8843776d27..76ec42f0ec 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qlinuxfb Plugin: ##################################################################### -add_qt_plugin(qlinuxfb +qt_add_plugin(qlinuxfb TYPE platforms CLASS_NAME QLinuxFbIntegrationPlugin SOURCES @@ -35,14 +35,14 @@ add_qt_plugin(qlinuxfb ## Scopes: ##################################################################### -extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate +qt_extend_target(qlinuxfb 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 aabf698441..ac2c216130 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -4,7 +4,7 @@ ## qlinuxfb Plugin: ##################################################################### -add_qt_plugin(qlinuxfb +qt_add_plugin(qlinuxfb TYPE platforms CLASS_NAME QLinuxFbIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES linuxfb # special case @@ -36,14 +36,14 @@ add_qt_plugin(qlinuxfb ## Scopes: ##################################################################### -extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qlinuxfb CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupport ) -extend_target(qlinuxfb CONDITION TARGET Qt::KmsSupportPrivate +qt_extend_target(qlinuxfb 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 94e57fc174..3ceb3e9ef1 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimal Plugin: ##################################################################### -add_qt_plugin(qminimal +qt_add_plugin(qminimal TYPE platforms CLASS_NAME QMinimalIntegrationPlugin SOURCES @@ -31,7 +31,7 @@ add_qt_plugin(qminimal ## Scopes: ##################################################################### -extend_target(qminimal CONDITION QT_FEATURE_freetype +qt_extend_target(qminimal CONDITION QT_FEATURE_freetype LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/minimal/CMakeLists.txt b/src/plugins/platforms/minimal/CMakeLists.txt index 0a56eabd25..5a6307889b 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimal Plugin: ##################################################################### -add_qt_plugin(qminimal +qt_add_plugin(qminimal TYPE platforms CLASS_NAME QMinimalIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimal # special case @@ -32,7 +32,7 @@ add_qt_plugin(qminimal ## Scopes: ##################################################################### -extend_target(qminimal CONDITION QT_FEATURE_freetype +qt_extend_target(qminimal 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 56d52951b9..ab797ea67d 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimalegl Plugin: ##################################################################### -add_qt_plugin(qminimalegl +qt_add_plugin(qminimalegl TYPE platforms CLASS_NAME QMinimalEglIntegrationPlugin SOURCES @@ -34,7 +34,7 @@ add_qt_plugin(qminimalegl ## Scopes: ##################################################################### -extend_target(qminimalegl CONDITION QT_FEATURE_opengl +qt_extend_target(qminimalegl 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 360043f22d..0d925fed68 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qminimalegl Plugin: ##################################################################### -add_qt_plugin(qminimalegl +qt_add_plugin(qminimalegl TYPE platforms CLASS_NAME QMinimalEglIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case @@ -35,7 +35,7 @@ add_qt_plugin(qminimalegl ## Scopes: ##################################################################### -extend_target(qminimalegl CONDITION QT_FEATURE_opengl +qt_extend_target(qminimalegl 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 5944b24741..3980ab62f8 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qoffscreen Plugin: ##################################################################### -add_qt_plugin(qoffscreen +qt_add_plugin(qoffscreen TYPE platforms CLASS_NAME QOffscreenIntegrationPlugin SOURCES @@ -32,7 +32,7 @@ add_qt_plugin(qoffscreen ## Scopes: ##################################################################### -extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_extend_target(qoffscreen 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 adccec6efe..03576b898e 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -4,7 +4,7 @@ ## qoffscreen Plugin: ##################################################################### -add_qt_plugin(qoffscreen +qt_add_plugin(qoffscreen TYPE platforms CLASS_NAME QOffscreenIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES offscreen # special case @@ -33,7 +33,7 @@ add_qt_plugin(qoffscreen ## Scopes: ##################################################################### -extend_target(qoffscreen CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_extend_target(qoffscreen 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 246847b4fc..276730755a 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qvnc Plugin: ##################################################################### -add_qt_plugin(qvnc +qt_add_plugin(qvnc TYPE platforms CLASS_NAME QVncIntegrationPlugin SOURCES @@ -40,7 +40,7 @@ add_qt_plugin(qvnc ## Scopes: ##################################################################### -extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qvnc 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 c141eb3107..0b5295287b 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -4,7 +4,7 @@ ## qvnc Plugin: ##################################################################### -add_qt_plugin(qvnc +qt_add_plugin(qvnc TYPE platforms CLASS_NAME QVncIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES vnc # special case @@ -41,7 +41,7 @@ add_qt_plugin(qvnc ## Scopes: ##################################################################### -extend_target(qvnc CONDITION TARGET Qt::InputSupportPrivate +qt_extend_target(qvnc 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 cce1a1c165..a23b1643de 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qwindows Plugin: ##################################################################### -add_qt_plugin(qwindows +qt_add_plugin(qwindows TYPE platforms CLASS_NAME QWindowsIntegrationPlugin SOURCES @@ -75,7 +75,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -add_qt_resource(qwindows "openglblacklists" +qt_add_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -89,7 +89,7 @@ add_qt_resource(qwindows "openglblacklists" ## Scopes: ##################################################################### -extend_target(qwindows CONDITION QT_FEATURE_accessibility +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -115,7 +115,7 @@ extend_target(qwindows CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qwindows CONDITION QT_FEATURE_vulkan +qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h LIBRARIES @@ -127,59 +127,59 @@ extend_target(qwindows CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 PUBLIC_LIBRARIES opengl32 ) -extend_target(qwindows CONDITION mingw +qt_extend_target(qwindows CONDITION mingw PUBLIC_LIBRARIES uuid ) -extend_target(qwindows CONDITION QT_FEATURE_opengl +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl SOURCES qwindowsopenglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2 SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES qwindowsglcontext.cpp qwindowsglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_dynamicgl +qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon +qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -extend_target(qwindows CONDITION QT_FEATURE_tabletevent +qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -extend_target(qwindows CONDITION QT_FEATURE_sessionmanager +qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -210,7 +210,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - add_qt_resource(qwindows "cursors" + qt_add_resource(qwindows "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -218,25 +218,25 @@ if(QT_FEATURE_imageformat_png) ) endif() -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate LIBRARIES Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES Qt::WindowsUIAutomationSupport ) -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw PUBLIC_LIBRARIES uuid ) -extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib +qt_extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib DEFINES LIBEGL_NAME= LIBGLESV2_NAME= ) -extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib +qt_extend_target(qwindows 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 1d8349a35c..7b07bcf5de 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -4,7 +4,7 @@ ## qwindows Plugin: ##################################################################### -add_qt_plugin(qwindows +qt_add_plugin(qwindows TYPE platforms CLASS_NAME QWindowsIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows # special case @@ -76,7 +76,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -add_qt_resource(qwindows "openglblacklists" +qt_add_resource(qwindows "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -90,7 +90,7 @@ add_qt_resource(qwindows "openglblacklists" ## Scopes: ##################################################################### -extend_target(qwindows CONDITION QT_FEATURE_accessibility +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -116,7 +116,7 @@ extend_target(qwindows CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) -extend_target(qwindows CONDITION QT_FEATURE_vulkan +qt_extend_target(qwindows CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h LIBRARIES @@ -128,59 +128,59 @@ extend_target(qwindows CONDITION QT_FEATURE_vulkan #### Keys ignored in scope 4:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl AND NOT QT_FEATURE_opengles2 PUBLIC_LIBRARIES opengl32 ) -extend_target(qwindows CONDITION mingw +qt_extend_target(qwindows CONDITION mingw PUBLIC_LIBRARIES uuid ) -extend_target(qwindows CONDITION QT_FEATURE_opengl +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl SOURCES qwindowsopenglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengles2 SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 +qt_extend_target(qwindows CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2 SOURCES qwindowsglcontext.cpp qwindowsglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_dynamicgl +qt_extend_target(qwindows CONDITION QT_FEATURE_dynamicgl SOURCES qwindowseglcontext.cpp qwindowseglcontext.h ) -extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon +qt_extend_target(qwindows CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_extend_target(qwindows CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -extend_target(qwindows CONDITION QT_FEATURE_tabletevent +qt_extend_target(qwindows CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -extend_target(qwindows CONDITION QT_FEATURE_sessionmanager +qt_extend_target(qwindows CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -211,7 +211,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - add_qt_resource(qwindows "cursors" + qt_add_resource(qwindows "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -219,14 +219,14 @@ if(QT_FEATURE_imageformat_png) ) endif() -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND TARGET Qt::WindowsUIAutomationSupportPrivate LIBRARIES Qt::WindowsUIAutomationSupportPrivate PUBLIC_LIBRARIES Qt::WindowsUIAutomationSupport ) -extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw +qt_extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw PUBLIC_LIBRARIES uuid ) @@ -234,3 +234,4 @@ extend_target(qwindows CONDITION QT_FEATURE_accessibility AND mingw # special case: # extend_target(qwindows CONDITION QT_FEATURE_combined_angle_lib ... # extend_target(qwindows CONDITION NOT QT_FEATURE_combined_angle_lib ... + diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 1706cdf713..6b82375e5a 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -26,7 +26,7 @@ qt_find_package(XKB_COMMON_X11 PROVIDED_TARGETS PkgConfig::XKB_COMMON_X11) ## XcbQpa Module: ##################################################################### -add_qt_module(XcbQpa +qt_add_module(XcbQpa INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -100,14 +100,14 @@ add_qt_module(XcbQpa ## Scopes: ##################################################################### -extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate +qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate LIBRARIES Qt::LinuxAccessibilitySupportPrivate PUBLIC_LIBRARIES Qt::LinuxAccessibilitySupport ) -extend_target(XcbQpa CONDITION QT_FEATURE_vulkan +qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h @@ -117,40 +117,40 @@ extend_target(XcbQpa CONDITION QT_FEATURE_vulkan Qt::VulkanSupport ) -extend_target(XcbQpa CONDITION QT_FEATURE_glib +qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 ) -extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop +qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop SOURCES qxcbdrag.cpp qxcbdrag.h ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib +qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib PUBLIC_LIBRARIES X11::XCB X11::X11 # special case ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm +qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES ${X11_SM_LIB} ${X11_ICE_LIB} ) -extend_target(XcbQpa CONDITION QT_FEATURE_dlopen +qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(XcbQpa CONDITION CLANG AND NOT ICC +qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting +qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting SOURCES nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h @@ -163,12 +163,12 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting nativepainting ) -extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender +qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender PUBLIC_LIBRARIES PkgConfig::XRender ) -extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting +qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting LIBRARIES WrapFreetype::WrapFreetype ) @@ -191,7 +191,7 @@ endif() ## qxcb Plugin: ##################################################################### -add_qt_plugin(qxcb +qt_add_plugin(qxcb TYPE platforms CLASS_NAME QXcbIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES xcb # special case 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 b9f7339a1d..1d1833450b 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -4,7 +4,7 @@ ## qxcb-egl-integration Plugin: ##################################################################### -add_qt_plugin(qxcb-egl-integration +qt_add_plugin(qxcb-egl-integration TYPE xcbglintegrations CLASS_NAME QXcbEglIntegrationPlugin SOURCES 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 ede38c9837..dfb74d7138 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -4,7 +4,7 @@ ## qxcb-glx-integration Plugin: ##################################################################### -add_qt_plugin(qxcb-glx-integration +qt_add_plugin(qxcb-glx-integration TYPE xcbglintegrations CLASS_NAME QXcbGlxIntegrationPlugin SOURCES @@ -33,12 +33,12 @@ add_qt_plugin(qxcb-glx-integration ## Scopes: ##################################################################### -extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx +qt_extend_target(qxcb-glx-integration CONDITION QT_FEATURE_xcb_glx PUBLIC_LIBRARIES XCB::GLX ) -extend_target(qxcb-glx-integration CONDITION QT_FEATURE_dlopen AND NOT static +qt_extend_target(qxcb-glx-integration 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 9b42ba2c53..de76f45c26 100644 --- a/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qgtk3 Plugin: ##################################################################### -add_qt_plugin(qgtk3 +qt_add_plugin(qgtk3 TYPE platformthemes CLASS_NAME QGtk3ThemePlugin SOURCES diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt index 82a783f9e1..f467f48a9d 100644 --- a/src/plugins/platformthemes/gtk3/CMakeLists.txt +++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt @@ -7,7 +7,7 @@ qt_find_package(X11) # special case ## qgtk3 Plugin: ##################################################################### -add_qt_plugin(qgtk3 +qt_add_plugin(qgtk3 TYPE platformthemes CLASS_NAME QGtk3ThemePlugin SOURCES diff --git a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt index 47be2bf853..6939c8d9e4 100644 --- a/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt +++ b/src/plugins/platformthemes/xdgdesktopportal/CMakeLists.txt @@ -4,7 +4,7 @@ ## qxdgdesktopportal Plugin: ##################################################################### -add_qt_plugin(qxdgdesktopportal +qt_add_plugin(qxdgdesktopportal TYPE platformthemes CLASS_NAME QXdgDesktopPortalThemePlugin SOURCES diff --git a/src/plugins/printsupport/cocoa/CMakeLists.txt b/src/plugins/printsupport/cocoa/CMakeLists.txt index 7cd7a92105..c8de1e76f6 100644 --- a/src/plugins/printsupport/cocoa/CMakeLists.txt +++ b/src/plugins/printsupport/cocoa/CMakeLists.txt @@ -4,7 +4,7 @@ ## cocoaprintersupport Plugin: ##################################################################### -add_qt_plugin(cocoaprintersupport +qt_add_plugin(cocoaprintersupport TYPE printsupport CLASS_NAME QCocoaPrinterSupportPlugin SOURCES diff --git a/src/plugins/printsupport/cups/.prev_CMakeLists.txt b/src/plugins/printsupport/cups/.prev_CMakeLists.txt index d615d58ef5..bbf8a60b3f 100644 --- a/src/plugins/printsupport/cups/.prev_CMakeLists.txt +++ b/src/plugins/printsupport/cups/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## cupsprintersupport Plugin: ##################################################################### -add_qt_plugin(cupsprintersupport +qt_add_plugin(cupsprintersupport TYPE printsupport CLASS_NAME QCupsPrinterSupportPlugin SOURCES diff --git a/src/plugins/printsupport/cups/CMakeLists.txt b/src/plugins/printsupport/cups/CMakeLists.txt index 4da73dfb07..6fc4efc941 100644 --- a/src/plugins/printsupport/cups/CMakeLists.txt +++ b/src/plugins/printsupport/cups/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(Cups PROVIDED_TARGETS Cups::Cups) # special case ## cupsprintersupport Plugin: ##################################################################### -add_qt_plugin(cupsprintersupport +qt_add_plugin(cupsprintersupport TYPE printsupport CLASS_NAME QCupsPrinterSupportPlugin SOURCES diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index 9fc1691bdf..d3d46bebbb 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqldb2 Plugin: ##################################################################### -add_qt_plugin(qsqldb2 +qt_add_plugin(qsqldb2 TYPE sqldrivers CLASS_NAME QDB2DriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqldb2 ## Scopes: ##################################################################### -extend_target(qsqldb2 CONDITION (TEST_architecture_arch STREQUAL "x86_64") +qt_extend_target(qsqldb2 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 49cb6bfc87..e55a062c9b 100644 --- a/src/plugins/sqldrivers/mysql/CMakeLists.txt +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlmysql Plugin: ##################################################################### -add_qt_plugin(qsqlmysql +qt_add_plugin(qsqlmysql TYPE sqldrivers CLASS_NAME QMYSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index a2cfb11167..3215b87c46 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqloci Plugin: ##################################################################### -add_qt_plugin(qsqloci +qt_add_plugin(qsqloci TYPE sqldrivers CLASS_NAME QOCIDriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqloci ## Scopes: ##################################################################### -extend_target(qsqloci CONDITION APPLE +qt_extend_target(qsqloci 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 ac3297eaaf..5eda5899cf 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlodbc Plugin: ##################################################################### -add_qt_plugin(qsqlodbc +qt_add_plugin(qsqlodbc TYPE sqldrivers CLASS_NAME QODBCDriverPlugin SOURCES @@ -28,7 +28,7 @@ add_qt_plugin(qsqlodbc ## Scopes: ##################################################################### -extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(qsqlodbc CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index 542d3b9727..871e87a4c1 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -6,7 +6,7 @@ qt_find_package(ODBC) # special case -add_qt_plugin(qsqlodbc +qt_add_plugin(qsqlodbc TYPE sqldrivers CLASS_NAME QODBCDriverPlugin SOURCES @@ -30,7 +30,7 @@ add_qt_plugin(qsqlodbc ## Scopes: ##################################################################### -extend_target(qsqlodbc CONDITION UNIX +qt_extend_target(qsqlodbc CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt index 1d810767bf..4047c6b1f6 100644 --- a/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlpsql Plugin: ##################################################################### -add_qt_plugin(qsqlpsql +qt_add_plugin(qsqlpsql TYPE sqldrivers CLASS_NAME QPSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt index 54da39a51a..46ad12677e 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt @@ -9,7 +9,7 @@ qt_find_package(PostgreSQL) # special case ## qsqlpsql Plugin: ##################################################################### -add_qt_plugin(qsqlpsql +qt_add_plugin(qsqlpsql TYPE sqldrivers CLASS_NAME QPSQLDriverPlugin SOURCES diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index 45cf01fb1e..ae08f26cb9 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlite Plugin: ##################################################################### -add_qt_plugin(qsqlite +qt_add_plugin(qsqlite TYPE sqldrivers CLASS_NAME QSQLiteDriverPlugin SOURCES @@ -28,12 +28,12 @@ add_qt_plugin(qsqlite ## Scopes: ##################################################################### -extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES sqlite ) -extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -48,22 +48,22 @@ extend_target(qsqlite CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION NOT CONFIG___contains___largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OS_WINRT ) @@ -71,22 +71,22 @@ extend_target(qsqlite CONDITION WINRT AND NOT QT_FEATURE_system_sqlite #### Keys ignored in scope 8:.:../../../3rdparty:../../../3rdparty/sqlite.pri:WINRT: # QMAKE_CFLAGS = "-Gy" -extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone +qt_extend_target(qsqlite CONDITION UNIX AND NOT QT_FEATURE_system_sqlite AND NOT WINRT AND NOT winphone DEFINES HAVE_USLEEP=1 ) -extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -extend_target(qsqlite CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_extend_target(qsqlite 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 50e3ba69ec..35fe8e69de 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -4,7 +4,7 @@ ## qsqlite Plugin: ##################################################################### -add_qt_plugin(qsqlite +qt_add_plugin(qsqlite TYPE sqldrivers CLASS_NAME QSQLiteDriverPlugin SOURCES @@ -31,5 +31,5 @@ add_qt_plugin(qsqlite # special case begin # Remove non-system-sqlite code -# extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite +# qt_extend_target(qsqlite CONDITION QT_FEATURE_system_sqlite # special case end diff --git a/src/plugins/styles/mac/CMakeLists.txt b/src/plugins/styles/mac/CMakeLists.txt index fe4bb64280..89b9594ebe 100644 --- a/src/plugins/styles/mac/CMakeLists.txt +++ b/src/plugins/styles/mac/CMakeLists.txt @@ -4,7 +4,7 @@ ## qmacstyle Plugin: ##################################################################### -add_qt_plugin(qmacstyle +qt_add_plugin(qmacstyle TYPE styles CLASS_NAME QMacStylePlugin SOURCES |