summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/zlib_dependency.pri
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-08-12 20:19:33 +0200
committerLars Knoll <lars.knoll@qt.io>2016-08-19 04:26:43 +0000
commit4b288e30efda67212b54d7f2e084d0f3acc594ae (patch)
tree80c91ddce64731a15d208e0ba9dfdc0f99b2029b /src/3rdparty/zlib_dependency.pri
parentd5dc46d319bb1f58f8a0ba64d2ef270eecbe8e65 (diff)
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>
Diffstat (limited to 'src/3rdparty/zlib_dependency.pri')
-rw-r--r--src/3rdparty/zlib_dependency.pri6
1 files changed, 1 insertions, 5 deletions
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 {