diff options
| author | aavit <eirik.aavitsland@digia.com> | 2012-11-28 09:58:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 13:47:10 +0100 |
| commit | 7f4644f6ed02eca59dd96077b7d43372280e21c9 (patch) | |
| tree | 98c69bc98a2d4bf044b1c7bf76aef43144bf5b0b | |
| parent | 7f5c46b18c9390da641d5c43431c3759c7453f46 (diff) | |
Use the bundled zlib in QtCore, if present.
Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 9 | ||||
| -rw-r--r-- | 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 77a1b24..b1f607b 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 5bde0c7..79be7ae 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 |