From 37b30983023a2e1fd5d7250ee2d15d8574a5cc2d Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Sat, 22 Dec 2018 18:55:37 +0100
Subject: Revert "Revert "configure: remove xkbcommon_evdev transition hack""

This reverts commit 9ee6eed572df76b60248153cf16febd6156ad006.

Now the qt5 dev baseline have both old and new one. We can remove
the old one.

Change-Id: I9f9495f2ae82f1e23d800b66384301ca0fa8a646
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/gui/configure.json | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src')

diff --git a/src/gui/configure.json b/src/gui/configure.json
index e0d643b844..7585e9c8d4 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -635,16 +635,6 @@
                 { "type": "pkgConfig", "args": "xkbcommon-x11" }
             ]
         },
-        "xkbcommon_evdev": {
-            "label": "xkbcommon_evdev TRANSITION HACK",
-            "test": {
-                "include": [ "xkbcommon/xkbcommon.h" ],
-                "main": "xkb_context_new(XKB_CONTEXT_NO_FLAGS);"
-            },
-            "sources": [
-                { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" }
-            ]
-        },
         "xrender": {
             "label": "XRender for native painting",
             "test": "x11/xrender",
@@ -1389,11 +1379,6 @@
             "condition": "libs.xkbcommon",
             "output": [ "privateFeature" ]
         },
-        "xkbcommon-evdev": {
-            "label": "xkbcommon-evdev TRANSITION HACK",
-            "condition": "libs.xkbcommon_evdev",
-            "output": [ "privateFeature" ]
-        },
         "xlib": {
             "label": "XLib",
             "autoDetect": "!config.darwin || features.xcb",
-- 
cgit v1.2.3