From 6b070340a818089cb5cc2d01c155d1696c8e392b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 13 Jan 2017 18:29:25 +0100 Subject: 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 Reviewed-by: Oswald Buddenhagen --- src/gui/configure.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui') 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": { -- cgit v1.2.3