From 4b288e30efda67212b54d7f2e084d0f3acc594ae Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 12 Aug 2016 20:19:33 +0200
Subject: employ QMAKE_USE: LIBS += -lfoo

this switches all instances of LIBS[_PRIVATE] += -lfoo where a config
tests exists for foo.
this removes some code duplication between tests and project files (in
case of conditionals), and ensures that the projects always actually use
the libraries configure has found.

Change-Id: Ia7e80c8db5f329290c7f1a4e03a8bf78882a687e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 src/3rdparty/harfbuzz_dependency.pri |  2 +-
 src/3rdparty/pcre_dependency.pri     |  2 +-
 src/3rdparty/png_dependency.pri      | 11 +----------
 src/3rdparty/zlib_dependency.pri     |  6 +-----
 4 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'src/3rdparty')

diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri
index 36abbfbe35..f39bb62381 100644
--- a/src/3rdparty/harfbuzz_dependency.pri
+++ b/src/3rdparty/harfbuzz_dependency.pri
@@ -1,5 +1,5 @@
 contains(QT_CONFIG, system-harfbuzz) {
-    LIBS_PRIVATE += -lharfbuzz
+    QMAKE_USE_PRIVATE += harfbuzz
 } else: contains(QT_CONFIG, harfbuzz) {
     INCLUDEPATH += $$PWD/harfbuzz-ng/include
     LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtharfbuzzng$$qtPlatformTargetSuffix()
diff --git a/src/3rdparty/pcre_dependency.pri b/src/3rdparty/pcre_dependency.pri
index 2a3c99c7ed..fa7df4df0e 100644
--- a/src/3rdparty/pcre_dependency.pri
+++ b/src/3rdparty/pcre_dependency.pri
@@ -3,5 +3,5 @@ pcre {
     INCLUDEPATH += $$PWD/pcre
     LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpcre$$qtPlatformTargetSuffix()
 } else {
-    LIBS_PRIVATE += -lpcre16
+    QMAKE_USE_PRIVATE += pcre
 }
diff --git a/src/3rdparty/png_dependency.pri b/src/3rdparty/png_dependency.pri
index 2ec2e8929d..12dbfc5487 100644
--- a/src/3rdparty/png_dependency.pri
+++ b/src/3rdparty/png_dependency.pri
@@ -1,14 +1,5 @@
 contains(QT_CONFIG, system-png) {
-    unix|mingw {
-        !contains(QT_CONFIG, no-pkg-config) {
-            CONFIG += link_pkgconfig
-            PKGCONFIG_PRIVATE += libpng
-        } else {
-            LIBS_PRIVATE += -lpng
-        }
-    } else {
-        LIBS += libpng.lib
-    }
+    QMAKE_USE_PRIVATE += libpng
 } else: contains(QT_CONFIG, png) {
     INCLUDEPATH += $$PWD/libpng
     LIBS_PRIVATE += -L$$QT_BUILD_TREE/lib -lqtpng$$qtPlatformTargetSuffix()
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 53e0b3ef39..11ad70621d 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -1,10 +1,6 @@
 # zlib dependency satisfied by bundled 3rd party zlib or system zlib
 contains(QT_CONFIG, system-zlib) {
-    if(unix|mingw):LIBS_PRIVATE += -lz
-    else {
-        isEmpty(ZLIB_LIBS): LIBS += zdll.lib
-        else: LIBS += $$ZLIB_LIBS
-    }
+    QMAKE_USE_PRIVATE += zlib
 } else {
     INCLUDEPATH +=  $$PWD/zlib
     !no_core_dep {
-- 
cgit v1.2.3