aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-02 23:25:58 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2019-02-14 17:40:27 +0000
commit5be2654885b3699520c4370579c929e2ce352e80 (patch)
tree3ae5a3bdf308a61dab72c2525a47a948f843d886 /recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch
parentcb1b47212659a21514553cb0a0102861a6e2299b (diff)
qtwebengine: Fix build with clang/libc++ on aarch64/arm
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch31
1 files changed, 31 insertions, 0 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
new file mode 100644
index 00000000..97f82847
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch
@@ -0,0 +1,31 @@
+From 7d8231d53a5e79eaea9fe2566f407faf41b233b4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 2 Feb 2019 23:23:14 -0800
+Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon"
+
+This reverts commit 21112a89e3d742451d6b449fc7075d51266fe709.
+
+To be compatible with qtbase 5.12.0, remove this patch when upgrading
+qtbase to 5.12.1
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/core/web_event_factory.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
+index 06dbd7ff..a45f7048 100644
+--- a/src/core/web_event_factory.cpp
++++ b/src/core/web_event_factory.cpp
+@@ -101,7 +101,7 @@ static KeyboardDriver keyboardDriverImpl()
+ if (platformName == QLatin1Literal("xcb") || platformName == QLatin1Literal("wayland"))
+ return KeyboardDriver::Xkb;
+
+-#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon)
++#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon_evdev)
+ // Based on QEglFSIntegration::createInputHandlers and QLibInputKeyboard::processKey.
+ if (platformName == QLatin1Literal("eglfs") && !qEnvironmentVariableIntValue("QT_QPA_EGLFS_NO_LIBINPUT"))
+ return KeyboardDriver::Xkb;
+--
+2.20.1
+