diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-13 18:29:25 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-19 21:48:04 +0000 |
| commit | 6b070340a818089cb5cc2d01c155d1696c8e392b (patch) | |
| tree | 2a91001eca7c37e7ba7060d391f71a7ef3dd20c6 /src/gui/configure.json | |
| parent | 4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff (diff) | |
fix detection of statically built system-libpng
it has a dependency on zlib, which needs to be explicitly linked when
linking statically.
Task-number: QTBUG-56163
Change-Id: I4564844e8a35686db48c429b259e78558d312819
Reviewed-by: Tim Blechmann <tim@klingt.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 154ba63f00..6f87eb5aed 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -159,8 +159,8 @@ "test": "unix/libpng", "sources": [ { "type": "pkgConfig", "args": "libpng" }, - { "libs": "-llibpng", "condition": "config.msvc" }, - { "libs": "-lpng", "condition": "!config.msvc" } + { "libs": "-llibpng -lzdll", "condition": "config.msvc" }, + { "libs": "-lpng -lz", "condition": "!config.msvc" } ] }, "mirclient": { |