From 9ee6eed572df76b60248153cf16febd6156ad006 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Thu, 13 Dec 2018 11:31:21 +0100
Subject: Revert "configure: remove xkbcommon_evdev transition hack"

This reverts commit 28fd625873f9bb191cb10a2a36a1b974c6e8c97e.

We still need to have this intermedia stage to have all need
things(qtwayland and qtwebengine) landed in dev.

This revert will be reverted later.

Change-Id: I0522d5b0efb2345e5b4879424d98531f7c1b44a2
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
---
 src/gui/configure.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src')

diff --git a/src/gui/configure.json b/src/gui/configure.json
index 7585e9c8d4..e0d643b844 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -635,6 +635,16 @@
                 { "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",
@@ -1379,6 +1389,11 @@
             "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