diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-08 10:59:47 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-08 16:28:46 +0000 |
commit | 48047d4f10d2bbae143a5e0d151b88e77174a981 (patch) | |
tree | f6fda5e6b7a5d34b44230aa9131f9388993d2a31 | |
parent | cd5c259e5490715b14205eda994213416df73378 (diff) | |
download | qtbase-48047d4f10d2bbae143a5e0d151b88e77174a981.tar.gz |
Regenerate platforms plugins part 3
Change-Id: Ibc4feb3187fa1aaa1f073f23aecc1a7bd5a818c3
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
5 files changed, 4 insertions, 85 deletions
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index d7ce4e4489..976c6bb2a0 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -69,7 +69,6 @@ add_qt_module(XcbQpa ) #### Keys ignored in scope 3:.:.:xcb_qpa_lib.pro:<TRUE>: -# CONFIG = "no_module_headers" "internal_module" # _LOADED = "qt_build_paths" "qt_module" ## Scopes: @@ -182,83 +181,14 @@ add_qt_plugin(qxcb #### Keys ignored in scope 24:.:.:xcb-plugin.pro:<TRUE>: # OTHER_FILES = "xcb.json" "README" -# PLUGIN_CLASS_NAME = "QXcbIntegrationPlugin" -# PLUGIN_TYPE = "platforms" # _LOADED = "qt_plugin" ## Scopes: ##################################################################### -#### Keys ignored in scope 25:.:.:xcb-plugin.pro:APPLE_OSX: -# CONFIG = "no_app_extension_api_only" - #### Keys ignored in scope 26:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(gl_integrations) - -if(NOT ON) +if(OFF) add_subdirectory(xcb-static) endif() - - if(TARGET Qt::LinuxAccessibilitySupportPrivate) - endif() - - if(QT_FEATURE_vulkan) - endif() - - if(QT_FEATURE_glib) - endif() - - if(QT_FEATURE_draganddrop) - endif() - - if(QT_FEATURE_xcb_xlib) - endif() - - if(QT_FEATURE_xcb_xinput) - endif() - - if(QT_FEATURE_xcb_sm) - endif() - - if(QT_FEATURE_vulkan) - endif() - - if(NOT ON) - endif() - - else() - - if(QT_FEATURE_xcb_xinput) - endif() - endif() - - if(QT_FEATURE_xkb) - - if(ON) - endif() - endif() - - if(QT_FEATURE_dlopen) - endif() - - if(CLANG AND NOT ICC) - endif() - - if(QT_FEATURE_xcb_native_painting) - - if(QT_FEATURE_xrender) - endif() - - if(QT_FEATURE_fontconfig) - endif() - endif() - - if(QT_FEATURE_xcb_xinput) - endif() - - if(APPLE_OSX) - endif() - - if(NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN) - endif() diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 92c0a842ad..2675070329 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -92,7 +92,6 @@ add_qt_module(XcbQpa ) #### Keys ignored in scope 3:.:.:xcb_qpa_lib.pro:<TRUE>: -# CONFIG = "no_module_headers" "internal_module" # _LOADED = "qt_build_paths" "qt_module" ## Scopes: @@ -207,18 +206,15 @@ add_qt_plugin(qxcb #### Keys ignored in scope 24:.:.:xcb-plugin.pro:<TRUE>: # OTHER_FILES = "xcb.json" "README" -# PLUGIN_CLASS_NAME = "QXcbIntegrationPlugin" -# PLUGIN_TYPE = "platforms" # _LOADED = "qt_plugin" ## Scopes: ##################################################################### -#### Keys ignored in scope 25:.:.:xcb-plugin.pro:APPLE_OSX: -# CONFIG = "no_app_extension_api_only" - #### Keys ignored in scope 26:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(gl_integrations) +if(OFF) + add_subdirectory(xcb-static) # special case TODO: xcb-static sub folder +endif() -#### TODO: xcb-static sub folder # special case diff --git a/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt index a5a744d898..210a924550 100644 --- a/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/CMakeLists.txt @@ -1,10 +1,8 @@ # Generated from gl_integrations.pro. - if(QT_FEATURE_xcb_egl_plugin) add_subdirectory(xcb_egl) endif() - if(QT_FEATURE_xcb_glx_plugin) add_subdirectory(xcb_glx) endif() 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 e54a6dd306..4452125e23 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/CMakeLists.txt @@ -31,7 +31,4 @@ add_qt_plugin(qxcb-egl-integration ) #### Keys ignored in scope 1:.:.:xcb_egl.pro:<TRUE>: -# CONFIG = "egl" -# PLUGIN_CLASS_NAME = "QXcbEglIntegrationPlugin" -# PLUGIN_TYPE = "xcbglintegrations" # _LOADED = "qt_plugin" "qt_build_paths" 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 d6bf4097be..940cbe12d1 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -31,8 +31,6 @@ add_qt_plugin(qxcb-glx-integration ) #### Keys ignored in scope 1:.:.:xcb_glx.pro:<TRUE>: -# PLUGIN_CLASS_NAME = "QXcbGlxIntegrationPlugin" -# PLUGIN_TYPE = "xcbglintegrations" # _LOADED = "qt_plugin" "qt_build_paths" ## Scopes: |