diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
| commit | 093290a662c17cdbedee7e820ec51c3e5ba82aef (patch) | |
| tree | 9523faf19abf5f3d411a16e7758367a05efe8a76 /src/gui/configure.json | |
| parent | c7cbf216999cd833cae667b8c6fbfa65d33e8efd (diff) | |
| parent | 95c8f24b71445956651a5d1eade9475dceb16675 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 40a91d261b..04e42fc247 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1282,7 +1282,7 @@ "label": "XCB", "section": "Platform plugins", "autoDetect": "!config.darwin", - "enable": "input.xcb == 'system' || input.xcb == 'qt'", + "enable": "input.xcb == 'system' || input.xcb == 'qt' || input.xcb == 'yes'", "condition": "libs.xcb", "output": [ "privateFeature" ] }, |