diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-20 11:19:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-20 12:31:27 +0200 |
| commit | 7950b6b283549c98f1e0f981c84b68071a13b616 (patch) | |
| tree | cf7281872045ebd57c68e10064ff0f400084aa13 /src/gui/configure.json | |
| parent | 58d2927861d3e57cac4f6db599e209d2bfb17a2c (diff) | |
| parent | 0794d61c822585530243f638687b8a75f0a15d0c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/tools/qbytearray.h
src/corelib/tools/qdatetime.h
src/corelib/tools/qstring.h
src/corelib/tools/qversionnumber.h
src/plugins/platforms/android/qandroidplatformintegration.cpp
tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 91e6bebc7f..854b187eb6 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -243,7 +243,7 @@ ] }, "xcb_syslibs": { - "label": "XCB (secondary)", + "label": "XCB (extensions)", "test": "qpa/xcb-syslibs", "sources": [ { "type": "pkgConfig", @@ -737,11 +737,11 @@ "output": [ "privateFeature" ] }, "system-xcb": { - "label": "Using system provided XCB libraries", - "enable": "input.xcb == 'system' || input.xcb == 'yes'", - "disable": "input.xcb == 'qt' || input.xcb == 'no'", + "label": "Using system-provided XCB libraries", + "enable": "input.xcb == 'system'", + "disable": "input.xcb == 'qt'", "autoDetect": "!config.darwin", - "condition": "libs.xcb && libs.xcb_syslibs", + "condition": "features.xcb && libs.xcb_syslibs", "output": [ "privateFeature" ] }, "x11-prefix": { @@ -757,8 +757,14 @@ }, "xcb-render": { "label": "XCB render", - "emitIf": "features.system-xcb", - "condition": "libs.xcb_render", + "emitIf": "features.xcb", + "condition": "!features.system-xcb || libs.xcb_render", + "output": [ "privateFeature" ] + }, + "xkb": { + "label": "XCB XKB", + "emitIf": "features.xcb", + "condition": "!features.system-xcb || libs.xcb_xkb", "output": [ "privateFeature" ] }, "xcb-xlib": { @@ -775,6 +781,7 @@ }, "xinput2": { "label": "Xinput2", + "emitIf": "features.xcb", "condition": "libs.xinput2", "output": [ "privateFeature" ] }, @@ -791,11 +798,6 @@ "condition": "libs.xkbcommon_x11", "output": [ "privateFeature" ] }, - "xkb": { - "label": "XCB XKB", - "condition": "features.system-xcb && libs.xcb_xkb", - "output": [ "privateFeature" ] - }, "xkb-config-root": { "label": "XKB config root", "emitIf": "features.xcb", |