diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-21 17:02:54 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 17:02:54 (GMT) |
| commit | 84ce7cc25b925d493a048ce5b00290483cd974f4 (patch) | |
| tree | 0f4e709ca90e9bf3e683668460734282f426089d /src/tools/bootstrap/bootstrap.pri | |
| parent | a2a5a8c5e203fe9d55f9addba1533a30c6f2ba19 (diff) | |
| parent | 32e532743dc6243612ade017e8c326ca0e7e0dec (diff) | |
| download | Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.zip Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.tar.gz Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pri')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 1de7b18..1aa8121 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -52,8 +52,9 @@ hpux-acc*|hpuxi-acc* { LIBS += -lbootstrap } !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile { - unix:LIBS += -lz -# win32:LIBS += libz.lib + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib } win32:LIBS += -luser32 |