diff options
| author | Mikko Gronoff <[email protected]> | 2025-05-27 08:35:27 +0300 |
|---|---|---|
| committer | Mikko Gronoff <[email protected]> | 2025-06-02 09:47:49 +0300 |
| commit | 01bd0410181845c642adc44ee0534b6de8b388d3 (patch) | |
| tree | 3185311e08757afb299fac8c8859eff4c09743af | |
| parent | 313ce6e26f7b80f8f60bfb25da94e97278088972 (diff) | |
Add pending upstream submitted patch to fix CI build of latest
submodule update & adaptation of wayland client to qtbase.
Change-Id: I36e7f1068ebae91b3df6f05e6be948b1b772137f
Reviewed-by: Ari Parkkila <[email protected]>
| -rw-r--r-- | recipes-qt/qt6/qtbase/0006-CMake-qtwaylandscanner-doesn-t-need-Wayland-Client.patch | 29 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/recipes-qt/qt6/qtbase/0006-CMake-qtwaylandscanner-doesn-t-need-Wayland-Client.patch b/recipes-qt/qt6/qtbase/0006-CMake-qtwaylandscanner-doesn-t-need-Wayland-Client.patch new file mode 100644 index 0000000..feb3b6a --- /dev/null +++ b/recipes-qt/qt6/qtbase/0006-CMake-qtwaylandscanner-doesn-t-need-Wayland-Client.patch @@ -0,0 +1,29 @@ +From 1c4a41193ae9865c9c97f8e135de0bd93068a760 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <[email protected]> +Date: Fri, 23 May 2025 08:51:22 +0000 +Subject: [PATCH] CMake: qtwaylandscanner doesn't need Wayland::Client + +Remove dependency to Wayland::Client as it's not needed and +prevents building qtwaylandscanner for Windows where Client +is not supported but scanner is needed for cross-compilations. + +Upstream-Status: Submitted [https://codereview.qt-project.org/c/qt/qtbase/+/647708] + +Change-Id: Ia38dda58c0800799673ae2d1e29626ce6b399f04 +--- + src/tools/configure.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/configure.cmake b/src/tools/configure.cmake +index 46d538726b3..7ab1509a89f 100644 +--- a/src/tools/configure.cmake ++++ b/src/tools/configure.cmake +@@ -31,7 +31,7 @@ qt_feature("qmake" PRIVATE + QT_FEATURE_datestring AND QT_FEATURE_regularexpression AND QT_FEATURE_temporaryfile) + + qt_feature("qtwaylandscanner" PRIVATE +- CONDITION TARGET Wayland::Scanner AND TARGET Wayland::Client ++ CONDITION TARGET Wayland::Scanner + ) + + qt_configure_add_summary_section(NAME "Core tools") diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 4a030f6..8abc7a6 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -24,6 +24,7 @@ SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \ file://0005-testlib-don-t-track-the-build-or-source-directories.patch \ + file://0006-CMake-qtwaylandscanner-doesn-t-need-Wayland-Client.patch \ " SRC_URI:append:class-native = "\ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ |