X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-qt%2Fqt%2Fqtwayland_agldemo.inc;h=111e2acd9c2ab3c6c525d1a55570fa15598153cc;hb=7baf8fb6dc8ed74332b7b587efae6097a4470237;hp=46bf2e744e49716823e9f556b882373646c8bd0b;hpb=41591d4f8c586aa801220fac0924556f406c58bd;p=AGL%2Fmeta-agl-demo.git diff --git a/recipes-qt/qt/qtwayland_agldemo.inc b/recipes-qt/qt/qtwayland_agldemo.inc index 46bf2e744..111e2acd9 100644 --- a/recipes-qt/qt/qtwayland_agldemo.inc +++ b/recipes-qt/qt/qtwayland_agldemo.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/qtwayland" +FILESEXTRAPATHS:append := ":${THISDIR}/qtwayland" # QT_MODULE_BRANCH = "5.4" @@ -11,16 +11,10 @@ FILESEXTRAPATHS_append := ":${THISDIR}/qtwayland" # file://0001-protocol-update-3rd-party-ivi-application-protocol.patch \ # file://0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch \ # -# The xdg-shell merged into upstream, so we don't need these patch anymore. -# But xdg-shell doesn't work well in current AGL Distro because of -# mismatch of protocol versions between server(weston) and client(Qt Apps). -# -# file://0016-xdg-shell-Add-xdg-shell-protocol-file-version-1.4.0.patch \ -# file://0017-xdg-shell-Add-minimize-feature-to-QWindow-using-wayl.patch \ -# file://0019-xdg-shell-upgrade-to-support-current-version-weston-.patch \ +# This patch breaks the build with qtwayland 5.15.7 (SPEC-4770) +# file://0001-client-qwaylandintegration-Do-not-attempt-to-use-the.patch \ # -SRC_URI_append = "\ - file://0010-Added-manifest-file-according-to-smack-3-domain-mode.patch \ +SRC_URI:append = "\ + file://0001-qwaylandwindow-Short-circuit-isExposed.patch \ " -