From d29502281765bcf73a6d422e67587a8d3ee0b2dd Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 24 Sep 2015 23:02:42 +0200 Subject: Qt5 now avairable in agl-demo-platfrom. v3: (Jan-Simon Möller) - Added meta-ruby to bblayers template file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v2: (Jan-Simon Möller) - Added meta-qt5 to bblayers template file - Removed unused patches (rpm specfile) v1: Support Qt5 for AGL Demo applications as UI Framework Qt5 now avairable in agl-demo-platfrom. This is a initial commit to support Qt5 for GUI Framework of AGL Distro. For now, these components are included into agl-demo-platform as default, Additional meta data for Qt5 (recipes-qt/qt5/*) is from: URL: git://git.projects.genivi.org/meta-genivi-demo commit: dc64c97667bac6046c878c689af579089f30641e To build and install Qt5 examples, need to setup local.conf properly, see README.md for more detail. Change-Id: I6c298d4f650a5ac8ee8f12acd1ee28df15e7dfad Signed-off-by: Tadao Tanikawa Signed-off-by: Jan-Simon Möller --- ...dow-add-support-for-IVI-Surface-ID-proper.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch (limited to 'recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch') diff --git a/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch b/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch new file mode 100644 index 00000000..591ef71c --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0002-qwaylandwindow-add-support-for-IVI-Surface-ID-proper.patch @@ -0,0 +1,34 @@ +From 31c60aedf415fd06b5c1aa16fdcef1504b67b96d Mon Sep 17 00:00:00 2001 +From: Holger Behrens +Date: Tue, 3 Feb 2015 09:53:43 +0100 +Subject: [meta-ivi-demo][PATCH 2/2] qwaylandwindow: add support for + IVI-Surface-ID property + +Signed-off-by: Holger Behrens +--- + src/client/qwaylandwindow.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp +index 45a58f2..781081a 100644 +--- a/src/client/qwaylandwindow.cpp ++++ b/src/client/qwaylandwindow.cpp +@@ -100,7 +100,14 @@ QWaylandWindow::QWaylandWindow(QWindow *window) + + if (!(window->flags() & Qt::BypassWindowManagerHint)) { + if (mDisplay->shellIvi()) { +- mShellSurface = new QWaylandIviSurface(mDisplay->shellIvi()->surface_create(IVI_SURFACE_ID + getpid(), object()), this); ++ unsigned int id = 0; ++ QVariant value = window->property("IVI-Surface-ID"); ++ if (value.isValid()) { ++ id = value.toUInt(); ++ } else { ++ id = IVI_SURFACE_ID + getpid(); ++ } ++ mShellSurface = new QWaylandIviSurface(mDisplay->shellIvi()->surface_create(id, object()), this); + } else if (mDisplay->shellXdg()) { + if (window->type() & Qt::Window) { + mShellSurface = new QWaylandXdgSurface(mDisplay->shellXdg()->get_xdg_surface(object()), this); +-- +2.2.1 + -- cgit 1.2.3-korg