diff options
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/.prev_CMakeLists.txt | 30 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 4 |
2 files changed, 13 insertions, 21 deletions
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:<TRUE>: -# _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:<TRUE>: # 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:<TRUE>: -# _LOADED = "qt_build_paths" "qt_module" - ## Scopes: ##################################################################### @@ -211,7 +208,6 @@ qt_add_plugin(qxcb #### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>: # OTHER_FILES = "xcb.json" "README" -# _LOADED = "qt_plugin" ## Scopes: ##################################################################### |