diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-18 15:02:05 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-03 14:10:43 +0000 |
commit | 28d4bfdf74ba9d66ad749fc7208ca8dc147a3927 (patch) | |
tree | 0c1860045e9ca308bab1b30ab163bca0df4fcb2c /recipes-qt/qt5/qtwebengine | |
parent | 5a328383122c7d82b096b1b090a850e14d6fa311 (diff) | |
download | meta-qt5-28d4bfdf74ba9d66ad749fc7208ca8dc147a3927.tar.gz |
Upgrade to 5.12.2
Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch b/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch deleted file mode 100644 index 97f82847..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 7d8231d53a5e79eaea9fe2566f407faf41b233b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 2 Feb 2019 23:23:14 -0800 | ||
4 | Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon" | ||
5 | |||
6 | This reverts commit 21112a89e3d742451d6b449fc7075d51266fe709. | ||
7 | |||
8 | To be compatible with qtbase 5.12.0, remove this patch when upgrading | ||
9 | qtbase to 5.12.1 | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | src/core/web_event_factory.cpp | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp | ||
17 | index 06dbd7ff..a45f7048 100644 | ||
18 | --- a/src/core/web_event_factory.cpp | ||
19 | +++ b/src/core/web_event_factory.cpp | ||
20 | @@ -101,7 +101,7 @@ static KeyboardDriver keyboardDriverImpl() | ||
21 | if (platformName == QLatin1Literal("xcb") || platformName == QLatin1Literal("wayland")) | ||
22 | return KeyboardDriver::Xkb; | ||
23 | |||
24 | -#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon) | ||
25 | +#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon_evdev) | ||
26 | // Based on QEglFSIntegration::createInputHandlers and QLibInputKeyboard::processKey. | ||
27 | if (platformName == QLatin1Literal("eglfs") && !qEnvironmentVariableIntValue("QT_QPA_EGLFS_NO_LIBINPUT")) | ||
28 | return KeyboardDriver::Xkb; | ||
29 | -- | ||
30 | 2.20.1 | ||
31 | |||