whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2017-01-13 18:29:25 +01:00
parent 4dcfd90e4f
commit 6b070340a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/configure.json
View File

@ -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": {