diff options
| author | David Redondo <qt@david-redondo.de> | 2023-12-06 14:39:55 +0100 |
|---|---|---|
| committer | David Redondo <qt@david-redondo.de> | 2023-12-07 23:04:59 +0100 |
| commit | a2ff329d2eb893ffae0d1cd18dd76bd494781295 (patch) | |
| tree | de023474c2be76a63891b30046006f6289101f1f /src/gui/configure.cmake | |
| parent | 6866e6f2fa1cfa8f91a940936296d3ecb5317640 (diff) | |
Introduce a configure feature for Wayland
Using the presence of the wayland-client lib as a condition.
Fixes: QTBUG-117386
Change-Id: If4336965ea06e3f4b06e9af661efdec38ba46136
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/configure.cmake')
| -rw-r--r-- | src/gui/configure.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 02601dc9c6..52b85a1db8 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -62,6 +62,7 @@ qt_find_package(WrapVulkanHeaders PROVIDED_TARGETS WrapVulkanHeaders::WrapVulkan MODULE_NAME gui QMAKE_LIB vulkan MARK_OPTIONAL) if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(Wayland PROVIDED_TARGETS Wayland::Server MODULE_NAME gui QMAKE_LIB wayland_server) + qt_find_package(Wayland PROVIDED_TARGETS Wayland::Client MODULE_NAME gui QMAKE_LIB wayland_client) endif() if((X11_SUPPORTED) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(X11 PROVIDED_TARGETS X11::X11 MODULE_NAME gui QMAKE_LIB xlib) @@ -863,7 +864,7 @@ qt_feature("eglfs_rcar" PRIVATE ) qt_feature("eglfs_viv_wl" PRIVATE LABEL "EGLFS i.Mx6 Wayland" - CONDITION QT_FEATURE_eglfs_viv AND Wayland_FOUND + CONDITION QT_FEATURE_eglfs_viv AND TARGET Wayland::Server ) qt_feature("eglfs_openwfd" PRIVATE LABEL "EGLFS OpenWFD" @@ -1243,6 +1244,11 @@ qt_feature("graphicsframecapture" PRIVATE CONDITION TEST_renderdoc OR (MACOS OR IOS) ) qt_feature_definition("undogroup" "QT_NO_UNDOGROUP" NEGATE VALUE "1") +qt_feature("wayland" PUBLIC + SECTION "Platform plugins" + LABEL "Wayland" + CONDITION TARGET Wayland::Client +) qt_configure_add_summary_section(NAME "Qt Gui") qt_configure_add_summary_entry(ARGS "accessibility") qt_configure_add_summary_entry(ARGS "freetype") |