diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:23:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:28:31 +0200 |
| commit | b48a13fd6843e12b5725aa3ff0d010007e7c43b4 (patch) | |
| tree | 316cfe36fc67906efcd92ff806c7c0da56ed4f8e /src/gui/configure.json | |
| parent | 3398d9d40cb0dae2dc2a1a4f7dc3b4b9cceae903 (diff) | |
| parent | 15fe60cfdada84ea519f08e905d59cc3fb6d20cd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
tests/auto/corelib/tools/qchar/tst_qchar.cpp
tests/auto/other/qaccessibility/accessiblewidgets.h
Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 5163045343..91e6bebc7f 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -164,7 +164,9 @@ { "libs": "-llibpng", "condition": "config.msvc" }, { "libs": "-lpng", "condition": "!config.msvc" } ], - "use": "zlib" + "use": [ + { "lib": "zlib", "condition": "features.system-zlib" } + ] }, "mirclient": { "label": "Mir client libraries", @@ -703,6 +705,7 @@ "label": " Using system libpng", "disable": "input.libpng == 'qt'", "enable": "input.libpng == 'system'", + "autoDetect": "features.system-zlib", "condition": "features.png && libs.libpng", "output": [ "privateFeature" ] }, |