diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 19:57:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 20:01:42 +0100 |
| commit | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (patch) | |
| tree | 71e777ca1e33c58edd9149821e970495ef4b75b2 /configure.json | |
| parent | e6234535929c67e7fbfa1ad7ce88f37df0b68d45 (diff) | |
| parent | 4d3781b640e8fb0a04e96b2d05199247556b8d86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
mkspecs/features/moc.prf
Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b
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 987fabc2ea..c5be88856d 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": { @@ -990,7 +989,10 @@ }, "qml-debug": { "label": "QML debugging", - "output": [ { "type": "publicQtConfig", "negative": true } ] + "output": [ + "privateFeature", + { "type": "publicQtConfig", "negative": true } + ] }, "compile_examples": { "label": "Compile examples", |