From 1c655fb0fc08e89ab5efb23889266b710334f1a5 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 20 Nov 2019 09:25:19 +0100 Subject: Post merge fixes Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor --- src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 20 +++++++--------- src/plugins/platforms/eglfs/CMakeLists.txt | 2 -- src/plugins/platforms/xcb/.prev_CMakeLists.txt | 30 ++++++++++-------------- src/plugins/platforms/xcb/CMakeLists.txt | 4 ---- 4 files changed, 22 insertions(+), 34 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index a47c1b0527..6f3309ea3c 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## EglFSDeviceIntegration Module: ##################################################################### -add_qt_module(EglFSDeviceIntegration +qt_add_module(EglFSDeviceIntegration INTERNAL_MODULE SOURCES api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h @@ -43,43 +43,42 @@ add_qt_module(EglFSDeviceIntegration #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:: # MODULE = "eglfsdeviceintegration" -# _LOADED = "qt_module" ## 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 Qt::PlatformCompositorSupport ) -extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY +qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY DEFINES EGLFS_PLATFORM_HOOKS ) -extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY +qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY DEFINES EGLFS_PREFERRED_PLUGIN= ) -if(NOT DEFINES___contains___QT_NO_CURSOR) +if(QT_FEATURE_cursor) # Resources: set(cursor_resource_files "cursor-atlas.png" "cursor.json" ) - add_qt_resource(EglFSDeviceIntegration "cursor" + qt_add_resource(EglFSDeviceIntegration "cursor" PREFIX "/" FILES @@ -87,7 +86,7 @@ if(NOT DEFINES___contains___QT_NO_CURSOR) ) 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 @@ -96,7 +95,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl ## qeglfs Plugin: ##################################################################### -add_qt_plugin(qeglfs +qt_add_plugin(qeglfs TYPE platforms CLASS_NAME QEglFSIntegrationPlugin SOURCES @@ -113,7 +112,6 @@ add_qt_plugin(qeglfs #### Keys ignored in scope 11:.:.:eglfs-plugin.pro:: # OTHER_FILES = "$$PWD/eglfs.json" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 2dde32b0f3..01949586bc 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -35,7 +35,6 @@ qt_add_module(EglFSDeviceIntegration #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:: # MODULE = "eglfsdeviceintegration" -# _LOADED = "qt_module" ## Scopes: ##################################################################### @@ -100,7 +99,6 @@ qt_add_plugin(qeglfs #### Keys ignored in scope 11:.:.:eglfs-plugin.pro:: # OTHER_FILES = "$$PWD/eglfs.json" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index a58d815db2..c504bbc64d 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## XcbQpa Module: ##################################################################### -add_qt_module(XcbQpa +qt_add_module(XcbQpa INTERNAL_MODULE NO_MODULE_HEADERS SOURCES @@ -71,20 +71,17 @@ add_qt_module(XcbQpa XKB::XKB ) -#### Keys ignored in scope 2:.:.:xcb_qpa_lib.pro:: -# _LOADED = "qt_build_paths" "qt_module" - ## 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 @@ -94,39 +91,39 @@ 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 ) -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 @@ -139,12 +136,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 ) @@ -152,7 +149,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_p ## qxcb Plugin: ##################################################################### -add_qt_plugin(qxcb +qt_add_plugin(qxcb TYPE platforms CLASS_NAME QXcbIntegrationPlugin SOURCES @@ -171,7 +168,6 @@ add_qt_plugin(qxcb #### Keys ignored in scope 19:.:.:xcb-plugin.pro:: # OTHER_FILES = "xcb.json" "README" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 6b82375e5a..c74e33e31a 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -94,9 +94,6 @@ qt_add_module(XcbQpa XKB::XKB ) -#### Keys ignored in scope 2:.:.:xcb_qpa_lib.pro:: -# _LOADED = "qt_build_paths" "qt_module" - ## Scopes: ##################################################################### @@ -211,7 +208,6 @@ qt_add_plugin(qxcb #### Keys ignored in scope 19:.:.:xcb-plugin.pro:: # OTHER_FILES = "xcb.json" "README" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### -- cgit v1.2.3