aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorBocklage, Jens <Jens_Bocklage@mentor.com>2016-11-25 16:31:23 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2016-11-30 09:01:28 +0000
commitd0f95885030e5f425c0423a7a29414a204aaa341 (patch)
tree1461e4777949016ba2ef1852a8e63f09e9f31680 /recipes-qt/qt5
parent0badea4ec8fdea7798f142dd73925323bd99b422 (diff)
Change QWindow::visible when surface visibility in ivi shell changes
Origin: https://codereview.qt-project.org/#/c/176211/ Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/qtwayland/0002_expand_ivi-shell.patch46
-rw-r--r--recipes-qt/qt5/qtwayland_%.bbappend1
2 files changed, 47 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwayland/0002_expand_ivi-shell.patch b/recipes-qt/qt5/qtwayland/0002_expand_ivi-shell.patch
new file mode 100644
index 000000000..12337101a
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland/0002_expand_ivi-shell.patch
@@ -0,0 +1,46 @@
+From 74e146ac208dcbfc34c99d903e9827ef2b932046 Mon Sep 17 00:00:00 2001
+From: Tasuku Suzuki <tasuku.suzuki@qt.io>
+Date: Wed, 9 Nov 2016 16:33:28 +0900
+Subject: [PATCH] Change QWindow::visible when surface visibility in ivi shell
+ is changed
+
+Change-Id: I2c2debe47fcb173f02aef5f4e60e52c35ad7b395
+Reviewed-by: Yusuke Binsaki <yusuke.binsaki@itage.co.jp>
+Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
+---
+ src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp | 5 +++++
+ src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h | 1 +
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp
+index ecc47e0..a2c7788 100644
+--- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp
++++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface.cpp
+@@ -89,6 +89,11 @@ void QWaylandIviSurface::ivi_surface_configure(int32_t width, int32_t height)
+ this->m_window->configure(0, width, height);
+ }
+
++void QWaylandIviSurface::ivi_controller_surface_visibility(int32_t visibility)
++{
++ this->m_window->window()->setVisible(visibility != 0);
++}
++
+ }
+
+ QT_END_NAMESPACE
+diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
+index 9ac81ad..e332ce7 100644
+--- a/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
++++ b/src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
+@@ -61,6 +61,7 @@ public:
+ private:
+ void createExtendedSurface(QWaylandWindow *window);
+ virtual void ivi_surface_configure(int32_t width, int32_t height) Q_DECL_OVERRIDE;
++ void ivi_controller_surface_visibility(int32_t visibility) Q_DECL_OVERRIDE;
+
+ QWaylandWindow *m_window;
+ QWaylandExtendedSurface *m_extendedWindow;
+--
+2.7.4
+
+
diff --git a/recipes-qt/qt5/qtwayland_%.bbappend b/recipes-qt/qt5/qtwayland_%.bbappend
index ed9e3749a..98d7cb7c6 100644
--- a/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/recipes-qt/qt5/qtwayland_%.bbappend
@@ -22,6 +22,7 @@ FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
SRC_URI_append = "\
file://0010-Added-manifest-file-according-to-smack-3-domain-mode.patch \
+ file://0002_expand_ivi-shell.patch \
"
SRC_URI_append_checkforkrogoth = "\
file://disable_xcomposite_egl_qt_wayland_client_buffer_integration.patch \