diff options
Diffstat (limited to 'src/plugins')
36 files changed, 137 insertions, 137 deletions
diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index 95b3aceff5..bab14249d6 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -23,12 +23,12 @@ qt_internal_add_plugin(QJpegPlugin ## Scopes: ##################################################################### -qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg PUBLIC_LIBRARIES JPEG::JPEG ) -qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg SOURCES ../../../3rdparty/libjpeg/src/jaricom.c ../../../3rdparty/libjpeg/src/jcapimin.c @@ -88,7 +88,7 @@ qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" -qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 52c3aa6911..7e69e1aba6 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -25,12 +25,12 @@ qt_internal_add_plugin(QJpegPlugin ## Scopes: ##################################################################### -qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg PUBLIC_LIBRARIES JPEG::JPEG ) -qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg SOURCES ../../../3rdparty/libjpeg/src/jaricom.c ../../../3rdparty/libjpeg/src/jcapimin.c @@ -98,7 +98,7 @@ endif() #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" -qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 5b2dada653..7345de1f81 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -60,17 +60,17 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 7fcd42a9bb..2e323325b0 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -63,17 +63,17 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_style_assets SOURCES extract-dummy.cpp ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index ee40e32033..d42cf811d5 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -67,7 +67,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" +qt_internal_add_resource(QCocoaIntegrationPlugin "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -81,23 +81,23 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" ## Scopes: ##################################################################### -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qcocoasessionmanager.cpp qcocoasessionmanager.h ) diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 51d7038950..d9832c2c6c 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -77,7 +77,7 @@ set(qcocoaresources_resource_files "images/waitcursor.png" ) -qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" +qt_internal_add_resource(QCocoaIntegrationPlugin "qcocoaresources" PREFIX "/qt-project.org/mac/cursors" FILES @@ -91,23 +91,23 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" ## Scopes: ##################################################################### -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qcocoavulkaninstance.h qcocoavulkaninstance.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qcocoasessionmanager.cpp qcocoasessionmanager.h ) diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt index c6957d57ec..074c9eff3f 100644 --- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt @@ -32,14 +32,14 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES DIRECTFB_GL_EGL ) -qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -47,7 +47,7 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOK #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_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 5e4a2f2baa..c66d8bd169 100644 --- a/src/plugins/platforms/directfb/CMakeLists.txt +++ b/src/plugins/platforms/directfb/CMakeLists.txt @@ -38,14 +38,14 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION QT_CONFIG___contains___directfb_egl SOURCES qdirectfb_egl.cpp qdirectfb_egl.h DEFINES DIRECTFB_GL_EGL ) -qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES DIRECTFB_PLATFORM_HOOKS ) @@ -53,7 +53,7 @@ qt_extend_target(QDirectFbIntegrationPlugin CONDITION NOT DIRECTFB_PLATFORM_HOOK #### Keys ignored in scope 3:.:.:directfb.pro:NOT DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY: # QMAKE_LIBDIR = "$$DIRECTFB_PLATFORM_HOOKS_LIBDIR" -qt_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(QDirectFbIntegrationPlugin CONDITION DIRECTFB_PLATFORM_HOOKS_SOURCES_ISEMPTY SOURCES qdirectfbeglhooks_stub.cpp ) diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 2fbaf4d018..cd1acc22e2 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFSDeviceIntegration Module: ##################################################################### -qt_add_module(EglFSDeviceIntegration +qt_internal_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -32,12 +32,12 @@ qt_add_module(EglFSDeviceIntegration ## Scopes: ##################################################################### -qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h @@ -45,12 +45,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl Qt::OpenGLPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES EGLFS_PLATFORM_HOOKS ) -qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY +qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY DEFINES EGLFS_PREFERRED_PLUGIN= ) @@ -62,7 +62,7 @@ if(QT_FEATURE_cursor) "cursor.json" ) - qt_add_resource(EglFSDeviceIntegration "cursor" + qt_internal_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -70,7 +70,7 @@ if(QT_FEATURE_cursor) ) endif() -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan SOURCES api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index f74a15f9e6..00b24aa03c 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: ##################################################################### -qt_add_module(EglFSDeviceIntegration +qt_internal_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -34,12 +34,12 @@ qt_add_module(EglFSDeviceIntegration ## Scopes: ##################################################################### -qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES api/qeglfscontext.cpp api/qeglfscontext_p.h api/qeglfscursor.cpp api/qeglfscursor_p.h @@ -49,12 +49,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl # special case begin # comment out -#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY +#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY #DEFINES #EGLFS_PLATFORM_HOOKS #) -#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY +#qt_internal_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY #DEFINES #EGLFS_PREFERRED_PLUGIN= #) @@ -67,7 +67,7 @@ if(QT_FEATURE_cursor) "cursor.json" ) - qt_add_resource(EglFSDeviceIntegration "cursor" + qt_internal_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -75,7 +75,7 @@ if(QT_FEATURE_cursor) ) endif() -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan SOURCES api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.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 61ae1b932a..61b5470cdf 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -32,7 +32,7 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" # begin special case -qt_extend_target(QEglFSKmsEglDeviceIntegrationPlugin +qt_internal_extend_target(QEglFSKmsEglDeviceIntegrationPlugin CONDITION QNX COMPILE_OPTIONS -fpermissive ) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt index ec11b355af..3d600c52f1 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFsKmsSupport Module: ##################################################################### -qt_add_module(EglFsKmsSupport +qt_internal_add_module(EglFsKmsSupport INTERNAL_MODULE NO_MODULE_HEADERS 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 0090dbb1ee..d71f1407f8 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: ##################################################################### -qt_add_module(EglFsKmsSupport +qt_internal_add_module(EglFsKmsSupport INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -28,7 +28,7 @@ qt_add_module(EglFsKmsSupport ) # begin special case -qt_extend_target(EglFsKmsSupport +qt_internal_extend_target(EglFsKmsSupport CONDITION QNX COMPILE_OPTIONS -fpermissive ) diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt index 138f323878..2e494c7d23 100644 --- a/src/plugins/platforms/ios/.prev_CMakeLists.txt +++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt @@ -42,12 +42,12 @@ qt_internal_add_plugin(QIOSIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 995dcc0a9d..e238cf70fa 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -45,12 +45,12 @@ qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin) ## Scopes: ##################################################################### -qt_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS +qt_internal_extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS SOURCES qiosclipboard.h qiosclipboard.mm qiosdocumentpickercontroller.h qiosdocumentpickercontroller.mm diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 258b70603e..920404ec77 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -27,12 +27,12 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index ea5642f1c0..d903fdc6a7 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -28,12 +28,12 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) -qt_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate +qt_internal_extend_target(QLinuxFbIntegrationPlugin CONDITION TARGET Qt::KmsSupportPrivate SOURCES qlinuxfbdrmscreen.cpp qlinuxfbdrmscreen.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/minimal/.prev_CMakeLists.txt b/src/plugins/platforms/minimal/.prev_CMakeLists.txt index bb670b4dd4..b51b64ef99 100644 --- a/src/plugins/platforms/minimal/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimal/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype +qt_internal_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 bf2e644251..3f6945ed26 100644 --- a/src/plugins/platforms/minimal/CMakeLists.txt +++ b/src/plugins/platforms/minimal/CMakeLists.txt @@ -29,7 +29,7 @@ qt_internal_add_plugin(QMinimalIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalIntegrationPlugin CONDITION QT_FEATURE_freetype +qt_internal_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 15ce608f04..9483f41762 100644 --- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt @@ -27,7 +27,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index beb4d54257..1758eb3af0 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -30,7 +30,7 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qminimaleglbackingstore.cpp qminimaleglbackingstore.h PUBLIC_LIBRARIES diff --git a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt index 319502ccc6..aa827366d3 100644 --- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt +++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt @@ -27,7 +27,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_internal_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 7a312701c6..160aa7df93 100644 --- a/src/plugins/platforms/offscreen/CMakeLists.txt +++ b/src/plugins/platforms/offscreen/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2 +qt_internal_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 ab11e57f0d..48e172ed70 100644 --- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt +++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt @@ -30,7 +30,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt index 5024459cf4..f3782b5434 100644 --- a/src/plugins/platforms/vnc/CMakeLists.txt +++ b/src/plugins/platforms/vnc/CMakeLists.txt @@ -31,7 +31,7 @@ qt_internal_add_plugin(QVncIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate +qt_internal_extend_target(QVncIntegrationPlugin CONDITION TARGET Qt::InputSupportPrivate PUBLIC_LIBRARIES Qt::InputSupportPrivate ) diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index d3e488ed20..cbb7bbcaa8 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -69,7 +69,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" +qt_internal_add_resource(QWindowsIntegrationPlugin "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -83,7 +83,7 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" ## Scopes: ##################################################################### -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qwindowsglcontext.cpp qwindowsglcontext.h qwindowsopenglcontext.h @@ -94,44 +94,44 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl PUBLIC_LIBRARIES opengl32 ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW PUBLIC_LIBRARIES uuid ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -162,7 +162,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - qt_add_resource(QWindowsIntegrationPlugin "cursors" + qt_internal_add_resource(QWindowsIntegrationPlugin "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -170,7 +170,7 @@ if(QT_FEATURE_imageformat_png) ) endif() -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -193,7 +193,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility PUBLIC_LIBRARIES uuid ) diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index fe12102811..2f1182190d 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -70,7 +70,7 @@ set(openglblacklists_resource_files "openglblacklists/default.json" ) -qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" +qt_internal_add_resource(QWindowsIntegrationPlugin "openglblacklists" PREFIX "/qt-project.org/windows/openglblacklists" FILES @@ -84,7 +84,7 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" ## Scopes: ##################################################################### -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qwindowsglcontext.cpp qwindowsglcontext.h qwindowsopenglcontext.h @@ -95,44 +95,44 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl #### Keys ignored in scope 3:.:.:windows.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_dynamicgl PUBLIC_LIBRARIES opengl32 ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW PUBLIC_LIBRARIES uuid ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_systemtrayicon SOURCES qwindowssystemtrayicon.cpp qwindowssystemtrayicon.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard SOURCES qwindowsclipboard.cpp qwindowsclipboard.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_clipboard AND QT_FEATURE_draganddrop SOURCES qwindowsdrag.cpp qwindowsdrag.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_tabletevent SOURCES qwindowstabletsupport.cpp qwindowstabletsupport.h INCLUDE_DIRECTORIES ${QT_SOURCE_TREE}/src/3rdparty/wintab ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_sessionmanager SOURCES qwindowssessionmanager.cpp qwindowssessionmanager.h ) @@ -163,7 +163,7 @@ if(QT_FEATURE_imageformat_png) "images/splitvcursor_64.png" ) - qt_add_resource(QWindowsIntegrationPlugin "cursors" + qt_internal_add_resource(QWindowsIntegrationPlugin "cursors" PREFIX "/qt-project.org/windows/cursors" FILES @@ -171,7 +171,7 @@ if(QT_FEATURE_imageformat_png) ) endif() -qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES uiautomation/qwindowsuiaaccessibility.cpp uiautomation/qwindowsuiaaccessibility.h uiautomation/qwindowsuiabaseprovider.cpp uiautomation/qwindowsuiabaseprovider.h @@ -194,7 +194,7 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility uiautomation/qwindowsuiawindowprovider.cpp uiautomation/qwindowsuiawindowprovider.h ) -qt_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility +qt_internal_extend_target(QWindowsIntegrationPlugin CONDITION MINGW AND QT_FEATURE_accessibility PUBLIC_LIBRARIES uuid ) diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index 67802a85ae..58f635c081 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## XcbQpa Module: ##################################################################### -qt_add_module(XcbQpa +qt_internal_add_module(XcbQpa INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -61,50 +61,50 @@ qt_add_module(XcbQpa ## Scopes: ##################################################################### -qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop SOURCES qxcbdrag.cpp qxcbdrag.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib PUBLIC_LIBRARIES X11::XCB ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES ${X11_SM_LIB} ${X11_ICE_LIB} ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC +qt_internal_extend_target(XcbQpa CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting +qt_internal_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 @@ -117,12 +117,12 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting nativepainting ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender PUBLIC_LIBRARIES PkgConfig::XRender ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting LIBRARIES WrapFreetype::WrapFreetype ) diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 182ec53d8b..7e78e9502f 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -4,7 +4,7 @@ ## XcbQpa Module: ##################################################################### -qt_add_module(XcbQpa +qt_internal_add_module(XcbQpa INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -65,22 +65,22 @@ qt_disable_apple_app_extension_api_only(XcbQpa) ## Scopes: ##################################################################### -qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_glib LIBRARIES GLIB2::GLIB2 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop SOURCES qxcbdrag.cpp qxcbdrag.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib PUBLIC_LIBRARIES X11::XCB # special case begin @@ -91,30 +91,30 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib # special case end ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm SOURCES qxcbsessionmanager.cpp qxcbsessionmanager.h PUBLIC_LIBRARIES ${X11_SM_LIB} ${X11_ICE_LIB} ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC +qt_internal_extend_target(XcbQpa CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting +qt_internal_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 @@ -127,19 +127,19 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting nativepainting ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender PUBLIC_LIBRARIES PkgConfig::XRender ) -qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting +qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting LIBRARIES WrapFreetype::WrapFreetype ) # special case begin if(TARGET XCB::XINPUT) - qt_extend_target(XcbQpa LIBRARIES XCB::XINPUT) + qt_internal_extend_target(XcbQpa LIBRARIES XCB::XINPUT) else() set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c") set_source_files_properties( 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 94d9b60310..24cdf8f636 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -29,12 +29,12 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx +qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx PUBLIC_LIBRARIES XCB::GLX ) -qt_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static +qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) diff --git a/src/plugins/sqldrivers/db2/CMakeLists.txt b/src/plugins/sqldrivers/db2/CMakeLists.txt index cebd216592..061eeae2fd 100644 --- a/src/plugins/sqldrivers/db2/CMakeLists.txt +++ b/src/plugins/sqldrivers/db2/CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QDB2DriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64") +qt_internal_extend_target(QDB2DriverPlugin CONDITION (TEST_architecture_arch STREQUAL "x86_64") DEFINES ODBC64 ) diff --git a/src/plugins/sqldrivers/oci/CMakeLists.txt b/src/plugins/sqldrivers/oci/CMakeLists.txt index 93af813691..617fce8453 100644 --- a/src/plugins/sqldrivers/oci/CMakeLists.txt +++ b/src/plugins/sqldrivers/oci/CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QOCIDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QOCIDriverPlugin CONDITION APPLE +qt_internal_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 5c71b578c0..0411d271cc 100644 --- a/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QODBCDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QODBCDriverPlugin CONDITION UNIX +qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/odbc/CMakeLists.txt b/src/plugins/sqldrivers/odbc/CMakeLists.txt index ab8f1eb2b6..1c86a79acf 100644 --- a/src/plugins/sqldrivers/odbc/CMakeLists.txt +++ b/src/plugins/sqldrivers/odbc/CMakeLists.txt @@ -28,7 +28,7 @@ qt_internal_add_plugin(QODBCDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QODBCDriverPlugin CONDITION UNIX +qt_internal_extend_target(QODBCDriverPlugin CONDITION UNIX DEFINES UNICODE ) diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt index 25796d9bb5..c34e2119f9 100644 --- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt @@ -26,12 +26,12 @@ qt_internal_add_plugin(QSQLiteDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES SQLite::SQLite3 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -46,37 +46,37 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_USLEEP=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_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 154516b5ff..2da5233525 100644 --- a/src/plugins/sqldrivers/sqlite/CMakeLists.txt +++ b/src/plugins/sqldrivers/sqlite/CMakeLists.txt @@ -26,7 +26,7 @@ qt_internal_add_plugin(QSQLiteDriverPlugin ## Scopes: ##################################################################### -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_system_sqlite PUBLIC_LIBRARIES SQLite::SQLite3 ) @@ -38,7 +38,7 @@ if (NOT QT_FEATURE_system_sqlite) endif() # special case end -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite SOURCES ../../../3rdparty/sqlite/sqlite3.c DEFINES @@ -53,37 +53,37 @@ qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_system_sqlite ../../../3rdparty/sqlite ) -qt_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION CMAKE_BUILD_TYPE STREQUAL Release AND NOT QT_FEATURE_system_sqlite DEFINES NDEBUG ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_largefile AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_DISABLE_LFS ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_posix_fallocate AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_POSIX_FALLOCATE=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QNX AND NOT QT_FEATURE_system_sqlite DEFINES _QNX_SOURCE ) -qt_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION UNIX AND NOT QT_FEATURE_system_sqlite DEFINES HAVE_USLEEP=1 ) -qt_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} ) -qt_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite +qt_internal_extend_target(QSQLiteDriverPlugin CONDITION NOT QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqlite DEFINES SQLITE_OMIT_LOAD_EXTENSION ) |