1 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/meta/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
new file mode 100644
index 0000000000..04ae7e0e87
--- /dev/null
+++ b/meta/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
@@ -0,0 +1,68 @@
+From e41bc392aa79073926aba917796e836f5b0d9f32 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 eae7ad5..0bb7b18 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 dc9000d..4eebfd6 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 c30f7b1..e6f1a0b 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()) {