1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Revert "configure: remove xkbcommon_evdev transition hack""

Browse Source 
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>
This commit is contained in:
Liang Qi 2018-12-22 18:55:37 +01:00
parent b337d2a88e
commit 37b3098302
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/configure.json
View File

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