<commit_before>From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001
From: <NAME> <<EMAIL>>
Date: Thu, 22 Dec 2016 13:54:31 +0100
Subject: [PATCH] fix build without xkbcommon-evdev

Signed-off-by: <NAME> <<EMAIL>>
---
 src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index 55381b4..5c054c6 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -338,12 +338,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()
 {
@@ -373,6 +367,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()) {
-- 
2.1.4
<commit_msg>qtwayland: update build without xkbcommon-evdev<commit_after>From 2b72ad7955fe19abb4a0b4ebb6bc7aa498e454bc Mon Sep 17 00:00:00 2001
From: <NAME> <<EMAIL>>
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: <NAME> <<EMAIL>>
Signed-off-by: <NAME> <<EMAIL>>
---
 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 7482cfd..cb3578c 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -120,3 +120,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 55381b4..5c054c6 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -338,12 +338,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()
 {
@@ -373,6 +367,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()) {
-- 
2.9.3

{'fraction_non_alphanumeric': 0.13514232508645915, 'fraction_numerical': 0.0710295291300878, 'mean_word_length': 4.36376604850214, 'pattern_counts': {'":': 0, '<': 18, '<?xml version=': 0, '>': 22, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 1, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '3316857', 'n_tokens_mistral': 1620, 'n_tokens_neox': 1421, 'n_words': 237}