From 7f4644f6ed02eca59dd96077b7d43372280e21c9 Mon Sep 17 00:00:00 2001
From: aavit <eirik.aavitsland@digia.com>
Date: Wed, 28 Nov 2012 09:58:11 +0100
Subject: [PATCH] Use the bundled zlib in QtCore, if present.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
---
src/3rdparty/zlib_dependency.pri | 9 +++------
src/plugins/imageformats/imageformats.pro | 5 +++--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 77a1b246..b1f607b7 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -1,10 +1,7 @@
# zlib dependency satisfied by bundled 3rd party zlib or system zlib
contains(QT_CONFIG, system-zlib) {
- symbian: LIBS_PRIVATE += -llibz
- else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
- else: LIBS += zdll.lib
+ if(unix|win32-g++*): LIBS_PRIVATE += -lz
+ else: LIBS += zdll.lib
} else {
-# We could copy the zlib sources over to this module, but for now we don't.
-# INCLUDEPATH += $$PWD/zlib
- error("zlib not available: Qt was not built with the system's zlib")
+ INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
}
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index 5bde0c70..79be7aea 100644
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -1,5 +1,6 @@
TEMPLATE = subdirs
SUBDIRS = \
tga \
- wbmp
-contains(QT_CONFIG, system-zlib): SUBDIRS += mng tiff
+ wbmp \
+ mng \
+ tiff
--
GitLab