summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-11-10 18:37:25 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-11-18 13:36:19 +0000
commit2ca54cf19660ded8be8225a7181d8f6930c4d9e8 (patch)
tree0a42a2a66282ce83f65162f707e95ce9df3d764e
parent67cbcf399aa1a18b9b1dbac0a6572a865687230a (diff)
make use of the new QtZlib module
Change-Id: I5c8e220d21bf2110f8382187c55c42379f1e7873 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-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 74efbbb..4194fe2 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -3,9 +3,5 @@ contains(QT_CONFIG, system-zlib) {
unix|mingw: LIBS_PRIVATE += -lz
else: LIBS += zdll.lib
} else {
- load(qt_build_paths)
- git_build: \
- INCLUDEPATH += $$[QT_INSTALL_HEADERS/get]/QtZlib
- else: \
- INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib
+ QT_PRIVATE += zlib-private
}