diff options
| author | Ari Parkkila <[email protected]> | 2025-03-20 10:05:10 +0200 |
|---|---|---|
| committer | Ari Parkkila <[email protected]> | 2025-04-22 08:50:58 +0200 |
| commit | 7e6aae6cd9a8a5e715ff9484c6c704bb65563d50 (patch) | |
| tree | e0914c094c503b452d0aa739ff408fbc0a0c4d96 | |
| parent | 950a9890ccacd3cb11ea1d31701033ad5c33fc4c (diff) | |
QtWayland is incompatible with weston's wayland so disable
problematic functionality temporarily until resolved.
Change-Id: I6f9450e384df29ed2d1b63aa159579d1a9a52612
Task-number: QTBUG-134955
Reviewed-by: Mikko Gronoff <[email protected]>
| -rw-r--r-- | recipes-qt/qt6/qtwayland/0001-Workaround-to-add-support-for-weston.patch | 31 | ||||
| -rw-r--r-- | recipes-qt/qt6/qtwayland_%.bbappend | 5 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes-qt/qt6/qtwayland/0001-Workaround-to-add-support-for-weston.patch b/recipes-qt/qt6/qtwayland/0001-Workaround-to-add-support-for-weston.patch new file mode 100644 index 0000000..d476857 --- /dev/null +++ b/recipes-qt/qt6/qtwayland/0001-Workaround-to-add-support-for-weston.patch @@ -0,0 +1,31 @@ +From 2226df403cb36199888beea421e7200678a3ec26 Mon Sep 17 00:00:00 2001 +From: Ari Parkkila <[email protected]> +Date: Thu, 20 Mar 2025 08:21:48 +0200 +Subject: [PATCH] Workaround to add support for weston + +Qt wayland is incompatible with weston's wayland so disable +problematic functionality temporarily. + +Upstream-Status: Inappropriate [https://bugreports.qt.io/browse/QTBUG-134955] +Task-number: QTBUG-127698 +--- + src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +index 29489acd..b8b84bae 100644 +--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp ++++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp +@@ -464,7 +464,8 @@ void QWaylandXdgSurface::setSizeHints() + maxHeight = 0; + + m_toplevel->set_min_size(minWidth, minHeight); +- m_toplevel->set_max_size(maxWidth, maxHeight); ++ // outcomment because of wayland protocol error: [email protected] ++ //m_toplevel->set_max_size(maxWidth, maxHeight); + } + } + +-- +2.34.1 + diff --git a/recipes-qt/qt6/qtwayland_%.bbappend b/recipes-qt/qt6/qtwayland_%.bbappend new file mode 100644 index 0000000..44ffd12 --- /dev/null +++ b/recipes-qt/qt6/qtwayland_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "\ + file://0001-Workaround-to-add-support-for-weston.patch \ +" |