diff options
| author | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
|---|---|---|
| committer | Lorn Potter <lopotter@ljp-linux-vm.localdomain> | 2010-06-17 04:11:33 (GMT) |
| commit | 8335adf60299b728c0bf7a346a5afd94a3d56712 (patch) | |
| tree | a8057969ac369ddffec9fa2b92e10cdf1fc319eb /src/svg/svg.pro | |
| parent | 0948de26bca9a68a354b436895bdf9e2db9c4288 (diff) | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| download | Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.zip Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.gz Qt-8335adf60299b728c0bf7a346a5afd94a3d56712.tar.bz2 | |
Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7
Diffstat (limited to 'src/svg/svg.pro')
| -rw-r--r-- | src/svg/svg.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro index d2a4227..de4bba6 100644 --- a/src/svg/svg.pro +++ b/src/svg/svg.pro @@ -44,7 +44,9 @@ symbian:TARGET.UID3=0x2001B2E2 #zlib support contains(QT_CONFIG, zlib) { - INCLUDEPATH += ../3rdparty/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 } |