Commit 7f4644f6 authored by aavit's avatar aavit Committed by The Qt Project
Browse files

Use the bundled zlib in QtCore, if present.


Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260

Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95
Reviewed-by: default avatarSamuel Rødal <samuel.rodal@digia.com>
parent 7f5c46b1
No related merge requests found
Showing with 6 additions and 8 deletions
# zlib dependency satisfied by bundled 3rd party zlib or system zlib # zlib dependency satisfied by bundled 3rd party zlib or system zlib
contains(QT_CONFIG, system-zlib) { contains(QT_CONFIG, system-zlib) {
symbian: LIBS_PRIVATE += -llibz if(unix|win32-g++*): LIBS_PRIVATE += -lz
else:if(unix|win32-g++*):LIBS_PRIVATE += -lz else: LIBS += zdll.lib
else: LIBS += zdll.lib
} else { } else {
# We could copy the zlib sources over to this module, but for now we don't. INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
# INCLUDEPATH += $$PWD/zlib
error("zlib not available: Qt was not built with the system's zlib")
} }
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = \ SUBDIRS = \
tga \ tga \
wbmp wbmp \
contains(QT_CONFIG, system-zlib): SUBDIRS += mng tiff mng \
tiff
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment