diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 07:21:05 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-06-17 07:21:05 (GMT) |
| commit | f39c9f38276add6ead9bb5d380cc2b32b0fa3390 (patch) | |
| tree | 2627db65ca9cddb432232ee21116afea73da07a4 /src/corelib/tools/tools.pri | |
| parent | 594900e68f8e264facbe8c75eaf2b857240bc072 (diff) | |
| parent | fac227f609e544f8f55aca8447b4328d6534407a (diff) | |
| download | Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.zip Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.gz Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/corelib/tools/tools.pri')
| -rw-r--r-- | src/corelib/tools/tools.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 4e0ebbc..e579dd5 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -106,8 +106,9 @@ contains(QT_CONFIG, zlib) { ../3rdparty/zlib/uncompr.c \ ../3rdparty/zlib/zutil.c } else:!contains(QT_CONFIG, no-zlib) { - unix:LIBS_PRIVATE += -lz -# win32:LIBS += libz.lib + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib } DEFINES += HB_EXPORT=Q_CORE_EXPORT |