From 505db9d020f0c176b9f1cc12766ed977d8da17a1 Mon Sep 17 00:00:00 2001 From: Tadao Tanikawa Date: Wed, 28 Oct 2015 20:23:21 +0900 Subject: Update Qt5 to latest stable release (5.5.1) This patch is for updating Qt5 to latest version (5.5.1). NOTES: To build Qt5.5.1, it is necessary to checkout master branch of meta-qt5 before bitbake until AGL/AGL-repo update to ready for Qt5.5.1. LIMITATIONS: - xdg-shell doesn't work because of protocol version mismatch between server(weston) and client(Qt5 Apps). Change-Id: If0f959dcb394da331692ec866f388cc5e7dc2baa Signed-off-by: Tadao Tanikawa Signed-off-by: Nobuhiko Tanibata --- recipes-qt/qt5/qtwayland_%.bbappend | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) (limited to 'recipes-qt/qt5/qtwayland_%.bbappend') diff --git a/recipes-qt/qt5/qtwayland_%.bbappend b/recipes-qt/qt5/qtwayland_%.bbappend index beaab28e..b61b121c 100644 --- a/recipes-qt/qt5/qtwayland_%.bbappend +++ b/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,17 +1,30 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -QT_MODULE_BRANCH = "5.4" +# QT_MODULE_BRANCH = "5.4" + +# TODO: +# These patches for IVI-SHELL are tempolary disabled because of issues. And new +# patches are proposed. +# +# file://0020-Add-IVI-Shell-protocol-file-version-patch-v6.patch \ +# file://0021-Implement-initial-IVI-Shell-support.patch \ +# 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 \ +# SRC_URI_append = "\ file://0010-Added-manifest-file-according-to-smack-3-domain-mode.patch \ - 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 \ - file://0020-Add-IVI-Shell-protocol-file-version-patch-v6.patch \ - file://0021-Implement-initial-IVI-Shell-support.patch \ file://disable_xcomposite_egl_qt_wayland_client_buffer_integration.patch \ - file://0001-protocol-update-3rd-party-ivi-application-protocol.patch \ - file://0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch \ + file://0001-Implement-initial-IVI-shell-support-with-shell-integ.patch \ + file://0002-Fix-multiple-QWindow.patch \ " DEPENDS_append_koelsch = " libegl gles-user-module" -- cgit 1.2.3-korg