From 28d4bfdf74ba9d66ad749fc7208ca8dc147a3927 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 18 Mar 2019 15:02:05 +0200 Subject: Upgrade to 5.12.2 Signed-off-by: Mikko Gronoff --- ...new-feature-name-xkbcommon_evdev-xkbcommo.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch (limited to 'recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch') 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 @@ -From 7d8231d53a5e79eaea9fe2566f407faf41b233b4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf