diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
| commit | 71264bae08d81bdeceb96133fdb01c370504dfcc (patch) | |
| tree | d5dadaac8209d5ef1857a4d65197b9ee12b39848 /configure.json | |
| parent | 5e785c0b83c9908c665f253c131629ac325a21f5 (diff) | |
| parent | 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/configure.json b/configure.json index ee931ced06..69019afa80 100644 --- a/configure.json +++ b/configure.json @@ -20,8 +20,7 @@ "commandline": { "assignments": { "DBUS_HOST_PATH": "host_dbus.prefix", - "DBUS_PATH": "dbus.prefix", - "ZLIB_LIBS": "zlib.libs" + "DBUS_PATH": "dbus.prefix" }, "custom": "qmakeArgs", "options": { @@ -1016,7 +1015,10 @@ }, "qml-debug": { "label": "QML debugging", - "output": [ { "type": "publicQtConfig", "negative": true } ] + "output": [ + "privateFeature", + { "type": "publicQtConfig", "negative": true } + ] }, "compile_examples": { "label": "Compile examples", |