summaryrefslogtreecommitdiffstats
path: root/meta/recipes-webos/qtwayland-webos/qtwayland-webos/qt.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-04-26 09:23:02 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-03-24 11:13:28 +0100
commite45f3d305e25ff2aef9e42697e583e6f69a9b6e6 (patch)
tree0bf698ed62d258d6e05d5a3129dea2e52b2d2121 /meta/recipes-webos/qtwayland-webos/qtwayland-webos/qt.patch
parentc44fc9b620f762ce68441f834e1a157288a488e6 (diff)
downloadopenembedded-core-contrib-e45f3d305e25ff2aef9e42697e583e6f69a9b6e6.tar.gz
meta-webosose: import recipes which often reproduce Yocto #12434
* just temporary to make it easier to reproduce, import big part of meta-webosose and some recipes from meta-oe * luna-init: /luna-init-fonts/usr/share/fonts/PreludeCompWGL-Light.ttf is owned by uid 1001, which is the same as the user running bitbake. This may be due to host contamination * qml-webos-framework: /qml-webos-framework/usr/share/dbus-1/system-services/com.webos.qml-app.service is owned by uid 1101, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated] * to reproduce this you can try to use something like this: export COMP=luna-init; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c package ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra BUILD/work/i586-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done export COMP=qml-webos-framework; for i in `seq -w 1 999`; do echo $i; bitbake -v -v -DDDD -f -c package ${COMP} 2>${COMP}-logerr.$i >${COMP}-log.$i; bitbake -v -v -DDDD -f -c package_qa ${COMP} 2>${COMP}-logerr.qa.$i >${COMP}-log.qa.$i || { cp -ra BUILD/work/i586-oe-linux/${COMP}/ ${COMP}-workdir-$i; bitbake -c cleansstate ${COMP} ; } done Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-webos/qtwayland-webos/qtwayland-webos/qt.patch')
-rw-r--r--meta/recipes-webos/qtwayland-webos/qtwayland-webos/qt.patch57
1 files changed, 57 insertions, 0 deletions
diff --git a/meta/recipes-webos/qtwayland-webos/qtwayland-webos/qt.patch b/meta/recipes-webos/qtwayland-webos/qtwayland-webos/qt.patch
new file mode 100644
index 0000000000..96611cdbe0
--- /dev/null
+++ b/meta/recipes-webos/qtwayland-webos/qtwayland-webos/qt.patch
@@ -0,0 +1,57 @@
+From 109b1503ed8ae4d09e764292ca23e1450931c3bc Mon Sep 17 00:00:00 2001
+From: Martin Jansa <martin.jansa@lge.com>
+Date: Mon, 26 Feb 2018 20:08:14 +0000
+Subject: [PATCH] WIP: qt 5.11 compatibility
+
+---
+ .../platforms/webos-wayland-egl/webosplatformwindow.cpp | 16 +---------------
+ .../platforms/webos-wayland-egl/webosplatformwindow_p.h | 1 -
+ 2 files changed, 1 insertion(+), 16 deletions(-)
+
+diff --git a/src/plugins/platforms/webos-wayland-egl/webosplatformwindow.cpp b/src/plugins/platforms/webos-wayland-egl/webosplatformwindow.cpp
+index 3c87a23..6b2f5b6 100644
+--- a/src/plugins/platforms/webos-wayland-egl/webosplatformwindow.cpp
++++ b/src/plugins/platforms/webos-wayland-egl/webosplatformwindow.cpp
+@@ -86,20 +86,6 @@ bool WebOSPlatformWindow::setWindowStateInternal(Qt::WindowState state)
+ return true;
+ }
+
+-void WebOSPlatformWindow::setWindowState(Qt::WindowState state)
+-{
+- setWindowStateInternal(state);
+-
+- WebOSShellSurface *ss = webOSShellSurfaceFor(window());
+- if (ss)
+- ss->setState(state);
+-
+- // If client is Qt::WindowNoState, it is assumed that
+- // client wants to change its own geometry by itself
+- if (state == Qt::WindowNoState)
+- m_hasOwnSize = true;
+-}
+-
+ void WebOSPlatformWindow::setGeometry(const QRect &rect)
+ {
+ bool initialize = false;
+@@ -169,5 +155,5 @@ void WebOSPlatformWindow::restoreMouseCursor(QWaylandInputDevice *device)
+
+ //Do not use qt's setCursor here. Cause App's window cursor haven't chagned,
+ //it will not affect current cursor shape, that is same shape.
+- mScreen->waylandCursor()->changeCursor(cp, window());
++ //mScreen->waylandCursor()->changeCursor(cp, window());
+ }
+diff --git a/src/plugins/platforms/webos-wayland-egl/webosplatformwindow_p.h b/src/plugins/platforms/webos-wayland-egl/webosplatformwindow_p.h
+index 2397dac..c3fe415 100644
+--- a/src/plugins/platforms/webos-wayland-egl/webosplatformwindow_p.h
++++ b/src/plugins/platforms/webos-wayland-egl/webosplatformwindow_p.h
+@@ -27,7 +27,6 @@ class WebOSPlatformWindow : public QWaylandEglWindow
+ {
+ public:
+ WebOSPlatformWindow(QWindow *window);
+- void setWindowState(Qt::WindowState state) Q_DECL_OVERRIDE;
+ void setGeometry(const QRect &rect) Q_DECL_OVERRIDE;
+
+ private:
+--
+1.9.1
+