diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-21 12:11:19 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-03-13 08:27:29 +0100 |
commit | 3efe4ea8b033f433b512ccf2cb90006a65c75834 (patch) | |
tree | c5a91e5c76c016637a5a93224afddf9eb4166164 /recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch | |
parent | e6fb3850d43f857e87f7c53fc7df5933fef98cbd (diff) |
qt5: upgrade to Qt 5.9.9
Additionally, update recipes with relevant diff
from Qt Company maintained meta-qt5 (5.9) layer.
It has few commits & some upstream content merge
based changes never upstreamed for one reason or
another (license alterations & other minor
things).
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch')
-rw-r--r-- | recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch deleted file mode 100644 index debca547..00000000 --- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 3c7bf618ca67f8f31af425ba59ea87005d6ed0ea Mon Sep 17 00:00:00 2001 -From: Raphael Freudiger <laser_b@gmx.ch> -Date: Tue, 10 Jan 2017 15:49:55 +0100 -Subject: [PATCH] fix build without xkbcommon-evdev -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I4f52c4ad741fdd7063a18b67f5777b52f03726fe -Signed-off-by: Raphael Freudiger <laser_b@gmx.ch> -Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> ---- - src/client/client.pro | 2 ++ - src/compositor/compositor.pro | 2 ++ - src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/client/client.pro b/src/client/client.pro -index eae7ad52..0bb7b188 100644 ---- a/src/client/client.pro -+++ b/src/client/client.pro -@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \ - wayland-decoration-client \ - wayland-shell-integration - load(qt_module) -+ -+LIBS += -lxkbcommon -diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro -index dc9000d9..4eebfd64 100644 ---- a/src/compositor/compositor.pro -+++ b/src/compositor/compositor.pro -@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri) - MODULE_PLUGIN_TYPES = \ - wayland-graphics-integration-server - load(qt_module) -+ -+LIBS += -lxkbcommon -diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index c30f7b18..e6f1a0b3 100644 ---- a/src/compositor/compositor_api/qwaylandkeyboard.cpp -+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp -@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) - xkb_state = xkb_state_new(keymap); - } - --uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) --{ -- const uint offset = 8; -- Q_ASSERT(nativeScanCode >= offset); -- return nativeScanCode - offset; --} - - void QWaylandKeyboardPrivate::createXKBKeymap() - { -@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() - } - #endif - -+uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) -+{ -+ const uint offset = 8; -+ Q_ASSERT(nativeScanCode >= offset); -+ return nativeScanCode - offset; -+} -+ - void QWaylandKeyboardPrivate::sendRepeatInfo() - { - Q_FOREACH (Resource *resource, resourceMap()) { |