aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-04-24 15:15:42 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-04-28 00:29:25 +0200
commitb1ee9d6cb0f28ba3dc5b35be97cd9507c39ede48 (patch)
tree2fe9ee45196c6fa8ee907503dc2bb1495489087c /recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch
parent8885505217f4180eb82ffc3ac8b0b9a24f5036b5 (diff)
2nd part of the layer/profile rework [2/2]
Main goal of this is to move the agl-service-* bindings into the core and to unify common recipes like wayland/weston into meta-agl-profile-graphical. As a placeholder for recipes is meta-agl-profile-demo which are being reshuffled. TLDR: remove recipes from meta-agl-demo that were moved to other layers Bug-AGL: SPEC-145 , SPEC-876 , SPEC-877 v2: moving updated udisks changes to meta-agl Change-Id: I873107f00adadeb6f3f266cce37b513fe6d44cf2 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch')
-rw-r--r--recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch b/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch
deleted file mode 100644
index 177710516..000000000
--- a/recipes-qt/qt5/qtwayland/0002-Fix-multiple-QWindow.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 23534d35587a8b62c945fef1adb29109e5c01bfa Mon Sep 17 00:00:00 2001
-From: Nobuhiko Tanibata <ntanibata@jp.adit-jv.com>
-Date: Fri, 6 Nov 2015 09:59:48 +0900
-Subject: [PATCH 2/2] Fix multiple QWindow
-
-Signed-off-by: Nobuhiko Tanibata <ntanibata@jp.adit-jv.com>
----
- .../ivi-shell/qwaylandivishellintegration.cpp | 16 ++++++++++------
- .../ivi-shell/qwaylandivishellintegration.h | 1 +
- 2 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp
-index 763fafb..c42f283 100644
---- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp
-+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp
-@@ -58,6 +58,7 @@ namespace QtWaylandClient {
-
- QWaylandIviShellIntegration::QWaylandIviShellIntegration()
- : m_iviApplication(Q_NULLPTR)
-+ , m_surfaceId(0)
- {
- }
-
-@@ -79,15 +80,18 @@ QWaylandShellSurface *QWaylandIviShellIntegration::createShellSurface(QWaylandWi
- if (!m_iviApplication)
- return Q_NULLPTR;
-
-- uint32_t id = 0;
-- QVariant value = window->property("IVI-Surface-ID");
-- if (value.isValid()) {
-- id = value.toUInt();
-+ if (m_surfaceId == 0) {
-+ QVariant value = window->property("IVI-Surface-ID");
-+ if (value.isValid()) {
-+ m_surfaceId = value.toUInt();
-+ } else {
-+ m_surfaceId = IVI_SURFACE_ID + getpid();
-+ }
- } else {
-- id = IVI_SURFACE_ID + getpid();
-+ m_surfaceId++;
- }
-
-- struct ivi_surface *surface = m_iviApplication->surface_create(id, window->object());
-+ struct ivi_surface *surface = m_iviApplication->surface_create(m_surfaceId, window->object());
-
- return new QWaylandIviSurface(surface, window);
- }
-diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
-index 4856ec6..1d10e91 100644
---- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
-+++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h
-@@ -70,6 +70,7 @@ private:
-
- private:
- QtWayland::ivi_application *m_iviApplication;
-+ uint32_t m_surfaceId;
- };
-
- }
---
-1.8.3.1