Revert "configure: remove xkbcommon_evdev transition hack"

This reverts commit 28fd625873.

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>
bb10
Liang Qi 2018-12-13 11:31:21 +01:00
parent af84f12298
commit 9ee6eed572
1 changed files with 15 additions and 0 deletions

View File

@ -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",