diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:32:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-05 13:37:21 +0100 |
| commit | 53b141dcebc2ca423dbc31e5b6321a769155e9a4 (patch) | |
| tree | e62c7d9875acab8094d64d137c90e7e5f53c0893 /src/gui/configure.json | |
| parent | 2c6c044500a92a3a125ce4b5d936992bdf02a487 (diff) | |
| parent | 6508fdca1dcc7105947befadba272d0fd4bbc27f (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I88384c70047391c75d9ff166c8d9881ff6751dbf
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 0a591e110c..2c1fe6c86e 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1193,6 +1193,7 @@ "label": "XCB", "section": "Platform plugins", "autoDetect": "!config.darwin", + "enable": "input.xcb == 'system' || input.xcb == 'qt'", "condition": "libs.xcb", "output": [ "privateFeature" ] }, |