diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/tools/bootstrap/bootstrap.pri | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pri')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 83fcee18d6..8a368cb228 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -57,7 +57,6 @@ hpux-acc*|hpuxi-acc* { LIBS += -lbootstrap } !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile { - symbian:LIBS_PRIVATE += -llibz else:if(unix|win32-g++*):LIBS_PRIVATE += -lz else:LIBS += zdll.lib } |