diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-22 18:55:37 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-23 10:46:48 +0000 |
| commit | 37b30983023a2e1fd5d7250ee2d15d8574a5cc2d (patch) | |
| tree | 73d8ae1ea262378e9285fdc219e05448765decf9 /src | |
| parent | b337d2a88e5dba8b1e4c01ebe60a7cddc76d05d3 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/configure.json | 15 |
1 files changed, 0 insertions, 15 deletions
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", |