From 1a96295755391b508ea37b4bfbb681ea15ed7559 Mon Sep 17 00:00:00 2001
From: Ralf Nolden <nolden@kde.org>
Date: Fri, 24 Jun 2016 22:33:31 +0200
Subject: Libpng config.tests: use pkg-config when available

Add pkg-config to the libpng usages as not all systems have the
symlink libpng.so -> libpng<version>.so (affected: NetBSD) that changes
with the version of the lib. If no-pkg-config is used, use -lpng as
before. Tested with FreeBSD 10.3, NetBSD 7.0.1 using png 1.6.21

Change-Id: I5c87f380c84da3d5c56c94da53adb900791c8caa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/3rdparty/png_dependency.pri | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/png_dependency.pri b/src/3rdparty/png_dependency.pri
index 78da861f77..f0a3936c8c 100644
--- a/src/3rdparty/png_dependency.pri
+++ b/src/3rdparty/png_dependency.pri
@@ -1,6 +1,14 @@
 contains(QT_CONFIG, system-png) {
-    unix|mingw: LIBS_PRIVATE += -lpng
-    else: LIBS += libpng.lib
+    unix|mingw {
+        !contains(QT_CONFIG, no-pkg-config) {
+            CONFIG += link_pkgconfig
+            PKGCONFIG_PRIVATE += libpng
+        } else {
+            LIBS_PRIVATE += -lpng
+        }
+    } else {
+        LIBS += libpng.lib
+    }
 } else: contains(QT_CONFIG, png) {
     include($$PWD/libpng.pri)
 }
-- 
cgit v1.2.3