diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 15:44:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:06 +0200 |
| commit | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (patch) | |
| tree | bdf9c293b998f776a26d6ad2ec273f282333f929 /recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch | |
| parent | a0b2220b5e08a7914d55afec0ff6e2316cb47404 (diff) | |
| download | meta-qt5-2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed.tar.gz | |
qt: refresh remaining patches and add links to meta-qt5 repos
* remove
qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
which is already applied and fuzzy patch just apply the same section
twice
* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade
* add comment with link to meta-qt5 repository where the meta-qt5 .patch
files are maintained, include branch and tag name so that it's more
clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch b/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch deleted file mode 100644 index 29c9180c..00000000 --- a/recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 3d30fd8df9b55449844207295ad3d51cc8bb44b1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Griebl <robert.griebl@pelagicore.com> | ||
| 3 | Date: Thu, 15 Dec 2016 17:43:00 +0100 | ||
| 4 | Subject: [PATCH 2/2] Fix initial window property values being propagated | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | This was broken since the the shell-surface refactoring. | ||
| 10 | |||
| 11 | Change-Id: I130b7396e85c570a9d11d609af6b3016e3f706f0 | ||
| 12 | Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> | ||
| 13 | Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> | ||
| 14 | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> | ||
| 15 | --- | ||
| 16 | src/client/qwaylandwindow.cpp | 3 +++ | ||
| 17 | 1 file changed, 3 insertions(+) | ||
| 18 | |||
| 19 | diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp | ||
| 20 | index c8be9c1..b6f16f0 100644 | ||
| 21 | --- a/src/client/qwaylandwindow.cpp | ||
| 22 | +++ b/src/client/qwaylandwindow.cpp | ||
| 23 | @@ -176,6 +176,9 @@ void QWaylandWindow::initWindow() | ||
| 24 | mShellSurface->setAppId(appId); | ||
| 25 | } | ||
| 26 | } | ||
| 27 | + // the user may have already set some window properties, so make sure to send them out | ||
| 28 | + for (auto it = m_properties.cbegin(); it != m_properties.cend(); ++it) | ||
| 29 | + mShellSurface->sendProperty(it.key(), it.value()); | ||
| 30 | } | ||
| 31 | |||
| 32 | // Enable high-dpi rendering. Scale() returns the screen scale factor and will | ||
| 33 | -- | ||
| 34 | 2.9.3 | ||
| 35 | |||
