summaryrefslogtreecommitdiffstats
path: root/src/svg
diff options
context:
space:
mode:
authorConstantin Makshin <cmakshin@gmail.com>2010-06-10 14:38:42 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-10 14:38:42 (GMT)
commit66539b167c01968f3040bfad9a59561a8b253639 (patch)
tree67a688b641fecf7a9a3acafe3f6dc594425aa39e /src/svg
parent2d8a4862d09e2d77c0c3ed0f297c3d27b179db08 (diff)
downloadQt-66539b167c01968f3040bfad9a59561a8b253639.zip
Qt-66539b167c01968f3040bfad9a59561a8b253639.tar.gz
Qt-66539b167c01968f3040bfad9a59561a8b253639.tar.bz2
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>) Merge-request: 2411 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/svg')
-rw-r--r--src/svg/svg.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index d2a4227..fa975e7 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -46,5 +46,7 @@ symbian:TARGET.UID3=0x2001B2E2
contains(QT_CONFIG, zlib) {
INCLUDEPATH += ../3rdparty/zlib
} else:!contains(QT_CONFIG, no-zlib) {
- unix:LIBS_PRIVATE += -lz
+ symbian:LIBS_PRIVATE += -llibz
+ else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
+ else:LIBS += zdll.lib
}