From 9ff225b0e0fdd6472bcfee0b4d810239940dea42 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2019 17:43:07 +0200 Subject: [PATCH] Regenerate platformsupport projects Change-Id: I6f9d6b09a0b62171adedffa326b86f57e42ad449 Reviewed-by: Simon Hausmann Reviewed-by: Qt CMake Build Bot --- src/platformsupport/CMakeLists.txt | 32 +++++---------- .../accessibility/CMakeLists.txt | 1 - src/platformsupport/clipboard/CMakeLists.txt | 1 - .../devicediscovery/CMakeLists.txt | 1 - src/platformsupport/edid/CMakeLists.txt | 1 - .../eglconvenience/.prev_CMakeLists.txt | 4 +- .../eglconvenience/CMakeLists.txt | 6 ++- .../eventdispatchers/.prev_CMakeLists.txt | 4 +- .../eventdispatchers/CMakeLists.txt | 1 - .../fbconvenience/CMakeLists.txt | 1 - .../fontdatabases/.prev_CMakeLists.txt | 4 +- .../fontdatabases/CMakeLists.txt | 1 - .../glxconvenience/.prev_CMakeLists.txt | 1 - .../glxconvenience/CMakeLists.txt | 1 - src/platformsupport/graphics/CMakeLists.txt | 1 - .../input/.prev_CMakeLists.txt | 41 +------------------ src/platformsupport/input/CMakeLists.txt | 2 - .../input/xkbcommon/CMakeLists.txt | 1 - .../kmsconvenience/.prev_CMakeLists.txt | 1 - .../kmsconvenience/CMakeLists.txt | 1 - .../linuxaccessibility/.prev_CMakeLists.txt | 4 +- .../linuxaccessibility/CMakeLists.txt | 1 - .../platformcompositor/CMakeLists.txt | 1 - src/platformsupport/services/CMakeLists.txt | 1 - src/platformsupport/themes/CMakeLists.txt | 1 - .../vkconvenience/.prev_CMakeLists.txt | 4 +- .../vkconvenience/CMakeLists.txt | 1 - .../windowsuiautomation/CMakeLists.txt | 1 - 28 files changed, 26 insertions(+), 94 deletions(-) diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index ee85e55c8d..158ad419a3 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -5,52 +5,40 @@ add_subdirectory(eventdispatchers) add_subdirectory(devicediscovery) add_subdirectory(fbconvenience) add_subdirectory(themes) - -if(QT_FEATURE_freetype OR APPLE OR WIN32) +if(APPLE OR QT_FEATURE_freetype OR WIN32) add_subdirectory(fontdatabases) endif() - -if(QT_FEATURE_evdev OR QT_FEATURE_tslib OR QT_FEATURE_libinput OR QT_FEATURE_integrityhid) +if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib) add_subdirectory(input) endif() - -if(UNIX AND NOT APPLE_UIKIT OR QT_FEATURE_xcb) +if(QT_FEATURE_xcb OR (UNIX AND NOT APPLE_UIKIT)) add_subdirectory(services) endif() - if(QT_FEATURE_opengl) add_subdirectory(platformcompositor) endif() - if(QT_FEATURE_egl) add_subdirectory(eglconvenience) endif() - -if(QT_FEATURE_xlib AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2) +if(QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2) add_subdirectory(glxconvenience) endif() - if(QT_FEATURE_kms) add_subdirectory(kmsconvenience) endif() - if(QT_FEATURE_accessibility) add_subdirectory(accessibility) - - if(QT_FEATURE_accessibility_atspi_bridge) - add_subdirectory(linuxaccessibility) - endif() - - if(WIN32 AND NOT WINRT) - add_subdirectory(windowsuiautomation) - endif() endif() - +if(QT_FEATURE_accessibility AND QT_FEATURE_accessibility_atspi_bridge) + add_subdirectory(linuxaccessibility) +endif() +if(QT_FEATURE_accessibility AND WIN32 AND NOT WINRT) + add_subdirectory(windowsuiautomation) +endif() if(APPLE) add_subdirectory(clipboard) add_subdirectory(graphics) endif() - if(QT_FEATURE_vulkan) add_subdirectory(vkconvenience) endif() diff --git a/src/platformsupport/accessibility/CMakeLists.txt b/src/platformsupport/accessibility/CMakeLists.txt index 3475b62c3e..288b1a33e5 100644 --- a/src/platformsupport/accessibility/CMakeLists.txt +++ b/src/platformsupport/accessibility/CMakeLists.txt @@ -20,6 +20,5 @@ add_qt_module(AccessibilitySupport ) #### Keys ignored in scope 1:.:.:accessibility.pro:: -# CONFIG = "static" "internal_module" # MODULE = "accessibility_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt index 2d7734ebdf..804f3d53c7 100644 --- a/src/platformsupport/clipboard/CMakeLists.txt +++ b/src/platformsupport/clipboard/CMakeLists.txt @@ -20,7 +20,6 @@ add_qt_module(ClipboardSupport ) #### Keys ignored in scope 1:.:.:clipboard.pro:: -# CONFIG = "static" "internal_module" # MODULE = "clipboard_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/devicediscovery/CMakeLists.txt b/src/platformsupport/devicediscovery/CMakeLists.txt index a0b5192d74..6253a024c0 100644 --- a/src/platformsupport/devicediscovery/CMakeLists.txt +++ b/src/platformsupport/devicediscovery/CMakeLists.txt @@ -18,7 +18,6 @@ add_qt_module(DeviceDiscoverySupport ) #### Keys ignored in scope 1:.:.:devicediscovery.pro:: -# CONFIG = "static" "internal_module" # MODULE = "devicediscovery_support" # QT_FOR_CONFIG = "gui-private" # _LOADED = "qt_module" diff --git a/src/platformsupport/edid/CMakeLists.txt b/src/platformsupport/edid/CMakeLists.txt index adb2d43cc0..2691d27d95 100644 --- a/src/platformsupport/edid/CMakeLists.txt +++ b/src/platformsupport/edid/CMakeLists.txt @@ -20,6 +20,5 @@ add_qt_module(EdidSupport ) #### Keys ignored in scope 1:.:.:edid.pro:: -# CONFIG = "static" "internal_module" # MODULE = "edid_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt index d286ff76ad..ea6b9ea902 100644 --- a/src/platformsupport/eglconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/eglconvenience/.prev_CMakeLists.txt @@ -19,12 +19,12 @@ add_qt_module(EglSupport PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" ) #### Keys ignored in scope 1:.:.:eglconvenience.pro:: -# CONFIG = "static" "internal_module" "egl" # MODULE = "egl_support" -# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" # _LOADED = "qt_module" ## Scopes: diff --git a/src/platformsupport/eglconvenience/CMakeLists.txt b/src/platformsupport/eglconvenience/CMakeLists.txt index e2cb21521b..d6d41d1ead 100644 --- a/src/platformsupport/eglconvenience/CMakeLists.txt +++ b/src/platformsupport/eglconvenience/CMakeLists.txt @@ -19,12 +19,14 @@ add_qt_module(EglSupport Qt::CorePrivate Qt::GuiPrivate EGL::EGL # special case + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) -#### Keys ignored in scope 1:.:eglconvenience.pro:: -# CONFIG = "static" "internal_module" "egl" +#### Keys ignored in scope 1:.:.:eglconvenience.pro:: # MODULE = "egl_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt index 85d9c967e3..22b89d3317 100644 --- a/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt +++ b/src/platformsupport/eventdispatchers/.prev_CMakeLists.txt @@ -15,12 +15,12 @@ add_qt_module(EventDispatcherSupport PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" ) #### Keys ignored in scope 1:.:.:eventdispatchers.pro:: -# CONFIG = "static" "internal_module" # MODULE = "eventdispatcher_support" -# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" # _LOADED = "qt_module" ## Scopes: diff --git a/src/platformsupport/eventdispatchers/CMakeLists.txt b/src/platformsupport/eventdispatchers/CMakeLists.txt index a85af287a0..fae7bff862 100644 --- a/src/platformsupport/eventdispatchers/CMakeLists.txt +++ b/src/platformsupport/eventdispatchers/CMakeLists.txt @@ -22,7 +22,6 @@ add_qt_module(EventDispatcherSupport ) #### Keys ignored in scope 1:.:.:eventdispatchers.pro:: -# CONFIG = "static" "internal_module" # MODULE = "eventdispatcher_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/fbconvenience/CMakeLists.txt b/src/platformsupport/fbconvenience/CMakeLists.txt index 51bbdfe176..61d61e4321 100644 --- a/src/platformsupport/fbconvenience/CMakeLists.txt +++ b/src/platformsupport/fbconvenience/CMakeLists.txt @@ -26,6 +26,5 @@ add_qt_module(FbSupport ) #### Keys ignored in scope 1:.:.:fbconvenience.pro:: -# CONFIG = "static" "internal_module" # MODULE = "fb_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt index 66c4b5314b..bd193fbe78 100644 --- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt +++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt @@ -15,12 +15,12 @@ add_qt_module(FontDatabaseSupport PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" ) #### Keys ignored in scope 1:.:.:fontdatabases.pro:: -# CONFIG = "static" "internal_module" # MODULE = "fontdatabase_support" -# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" # _LOADED = "qt_module" ## Scopes: diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt index d6e92bb2f2..38b0dfb40f 100644 --- a/src/platformsupport/fontdatabases/CMakeLists.txt +++ b/src/platformsupport/fontdatabases/CMakeLists.txt @@ -23,7 +23,6 @@ add_qt_module(FontDatabaseSupport ) #### Keys ignored in scope 1:.:.:fontdatabases.pro:: -# CONFIG = "static" "internal_module" # MODULE = "fontdatabase_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt index 5a407885cf..ecee19fc8b 100644 --- a/src/platformsupport/glxconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/glxconvenience/.prev_CMakeLists.txt @@ -21,6 +21,5 @@ add_qt_module(GlxSupport ) #### Keys ignored in scope 1:.:.:glxconvenience.pro:: -# CONFIG = "static" "internal_module" # MODULE = "glx_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/glxconvenience/CMakeLists.txt b/src/platformsupport/glxconvenience/CMakeLists.txt index 484fabf234..ff2357d52c 100644 --- a/src/platformsupport/glxconvenience/CMakeLists.txt +++ b/src/platformsupport/glxconvenience/CMakeLists.txt @@ -23,6 +23,5 @@ add_qt_module(GlxSupport ) #### Keys ignored in scope 1:.:.:glxconvenience.pro:: -# CONFIG = "static" "internal_module" # MODULE = "glx_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt index 4dd6db7ebd..f342fd0c08 100644 --- a/src/platformsupport/graphics/CMakeLists.txt +++ b/src/platformsupport/graphics/CMakeLists.txt @@ -20,6 +20,5 @@ add_qt_module(GraphicsSupport ) #### Keys ignored in scope 1:.:.:graphics.pro:: -# CONFIG = "static" "internal_module" # MODULE = "graphics_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt index d5e013ba9f..1d5270f234 100644 --- a/src/platformsupport/input/.prev_CMakeLists.txt +++ b/src/platformsupport/input/.prev_CMakeLists.txt @@ -17,12 +17,12 @@ add_qt_module(InputSupport Qt::Core Qt::DeviceDiscoverySupport Qt::Gui + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" ) #### Keys ignored in scope 3:.:.:input-support.pro:: -# CONFIG = "static" "internal_module" # MODULE = "input_support" -# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" # _LOADED = "qt_module" ## Scopes: @@ -103,43 +103,6 @@ extend_target(InputSupport CONDITION QT_FEATURE_integrityhid LIBRARIES integrityhid ) - if(QT_FEATURE_xkbcommon) add_subdirectory(xkbcommon) endif() - - if(QT_FEATURE_evdev) - - if(QT_FEATURE_tabletevent) - - if(QT_FEATURE_libudev) - endif() - endif() - - if(QT_FEATURE_libudev) - endif() - - if(QT_FEATURE_libudev) - endif() - - if(QT_FEATURE_libudev) - endif() - - if(QT_FEATURE_mtdev) - endif() - endif() - - if(QT_FEATURE_tslib) - endif() - - if(QT_FEATURE_libinput) - - if(QT_FEATURE_xkbcommon) - endif() - endif() - - if(QT_FEATURE_evdev OR QT_FEATURE_libinput) - endif() - - if(QT_FEATURE_integrityhid) - endif() diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 681d103a82..3c5cbaa4ce 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -27,7 +27,6 @@ add_qt_module(InputSupport ) #### Keys ignored in scope 3:.:.:input-support.pro:: -# CONFIG = "static" "internal_module" # MODULE = "input_support" # _LOADED = "qt_module" @@ -109,7 +108,6 @@ extend_target(InputSupport CONDITION QT_FEATURE_integrityhid LIBRARIES integrityhid ) - if(QT_FEATURE_xkbcommon) add_subdirectory(xkbcommon) endif() diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt index 50c86bb5b8..958e00fd06 100644 --- a/src/platformsupport/input/xkbcommon/CMakeLists.txt +++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt @@ -24,7 +24,6 @@ add_qt_module(XkbCommonSupport ) #### Keys ignored in scope 1:.:.:xkbcommon.pro:: -# CONFIG = "static" "internal_module" # MODULE = "xkbcommon_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt index ec29be7f4e..a595aa40c8 100644 --- a/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/.prev_CMakeLists.txt @@ -21,6 +21,5 @@ add_qt_module(KmsSupport ) #### Keys ignored in scope 1:.:.:kmsconvenience.pro:: -# CONFIG = "static" "internal_module" # MODULE = "kms_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/kmsconvenience/CMakeLists.txt b/src/platformsupport/kmsconvenience/CMakeLists.txt index a2ad5ecc9f..9ea4842e52 100644 --- a/src/platformsupport/kmsconvenience/CMakeLists.txt +++ b/src/platformsupport/kmsconvenience/CMakeLists.txt @@ -23,6 +23,5 @@ add_qt_module(KmsSupport ) #### Keys ignored in scope 1:.:.:kmsconvenience.pro:: -# CONFIG = "static" "internal_module" # MODULE = "kms_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt index a5ad155a7a..c6f7aba91b 100644 --- a/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt +++ b/src/platformsupport/linuxaccessibility/.prev_CMakeLists.txt @@ -37,10 +37,10 @@ add_qt_module(LinuxAccessibilitySupport Qt::Core Qt::DBus Qt::Gui + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" ) #### Keys ignored in scope 1:.:.:linuxaccessibility.pro:: -# CONFIG = "static" "internal_module" # MODULE = "linuxaccessibility_support" -# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" # _LOADED = "qt_module" diff --git a/src/platformsupport/linuxaccessibility/CMakeLists.txt b/src/platformsupport/linuxaccessibility/CMakeLists.txt index 023f17197b..22681afa60 100644 --- a/src/platformsupport/linuxaccessibility/CMakeLists.txt +++ b/src/platformsupport/linuxaccessibility/CMakeLists.txt @@ -44,6 +44,5 @@ add_qt_module(LinuxAccessibilitySupport ) #### Keys ignored in scope 1:.:.:linuxaccessibility.pro:: -# CONFIG = "static" "internal_module" # MODULE = "linuxaccessibility_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt index c37ba600b3..0d3bc597c0 100644 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ b/src/platformsupport/platformcompositor/CMakeLists.txt @@ -21,6 +21,5 @@ add_qt_module(PlatformCompositorSupport ) #### Keys ignored in scope 1:.:.:platformcompositor.pro:: -# CONFIG = "static" "internal_module" # MODULE = "platformcompositor_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt index 52b96aff24..59e10a84a4 100644 --- a/src/platformsupport/services/CMakeLists.txt +++ b/src/platformsupport/services/CMakeLists.txt @@ -22,7 +22,6 @@ add_qt_module(ServiceSupport ) #### Keys ignored in scope 1:.:.:services.pro:: -# CONFIG = "static" "internal_module" # MODULE = "service_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/themes/CMakeLists.txt b/src/platformsupport/themes/CMakeLists.txt index d5bb3e1279..0000a9092d 100644 --- a/src/platformsupport/themes/CMakeLists.txt +++ b/src/platformsupport/themes/CMakeLists.txt @@ -20,7 +20,6 @@ add_qt_module(ThemeSupport ) #### Keys ignored in scope 1:.:.:themes.pro:: -# CONFIG = "static" "internal_module" # MODULE = "theme_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt index e48ce7f9ad..4de17b99c0 100644 --- a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt +++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt @@ -18,10 +18,10 @@ add_qt_module(VulkanSupport PUBLIC_LIBRARIES Qt::Core Qt::Gui + PRECOMPILED_HEADER + "../../corelib/global/qt_pch.h" ) #### Keys ignored in scope 1:.:.:vkconvenience.pro:: -# CONFIG = "static" "internal_module" # MODULE = "vulkan_support" -# PRECOMPILED_HEADER = "../../corelib/global/qt_pch.h" # _LOADED = "qt_module" diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt index feee14dafc..ee7e1c560c 100644 --- a/src/platformsupport/vkconvenience/CMakeLists.txt +++ b/src/platformsupport/vkconvenience/CMakeLists.txt @@ -25,6 +25,5 @@ add_qt_module(VulkanSupport ) #### Keys ignored in scope 1:.:.:vkconvenience.pro:: -# CONFIG = "static" "internal_module" # MODULE = "vulkan_support" # _LOADED = "qt_module" diff --git a/src/platformsupport/windowsuiautomation/CMakeLists.txt b/src/platformsupport/windowsuiautomation/CMakeLists.txt index 1f0b545c83..2a182feaea 100644 --- a/src/platformsupport/windowsuiautomation/CMakeLists.txt +++ b/src/platformsupport/windowsuiautomation/CMakeLists.txt @@ -28,6 +28,5 @@ add_qt_module(WindowsUIAutomationSupport ) #### Keys ignored in scope 1:.:.:windowsuiautomation.pro:: -# CONFIG = "static" "internal_module" # MODULE = "windowsuiautomation_support" # _LOADED = "qt_module"