summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-05-27 15:12:26 +0200
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-06-07 05:45:48 -0500
commit410ffa89bb6ecfa5c201f37d88aa6e88e5d5ac85 (patch)
tree18dfa6c0e1c5c958906bd8282c77cadcccf2f63e /src
parente1e1973b6940b24baf9bea21f3f684034345ff70 (diff)
downloadqtsvg-410ffa89bb6ecfa5c201f37d88aa6e88e5d5ac85.tar.gz
Hardcoded zlib linking options.
This also removes support for non-system based zlib. If we want to support that, it needs some extra work, since it needs access to the source code of zlib.
Diffstat (limited to 'src')
-rw-r--r--src/svg/svg.pro8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 3b25a69..b235661 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -49,4 +49,10 @@ INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
symbian:TARGET.UID3=0x2001B2E2
-include($$QT_SOURCE_TREE/src/3rdparty/zlib_dependency.pri)
+contains(QT_CONFIG, system-zlib) {
+ symbian: LIBS_PRIVATE += -llibz
+ else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+ else: LIBS += zdll.lib
+} else {
+ error("Using non system zlib is currently unsupported")
+}