AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on Linux: link to zlib in the bootstrapped tools.

Browse Source 
That "else:" with no first condition is probably throwing qmake
off. The condition was removed in
ad2930f825.

Change-Id: I6af36e3f673a65a6152fb467162c25afc13b4196
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Thiago Macieira 2012-05-09 19:14:58 -07:00 committed by Qt by Nokia
parent 0390b02a7f
commit 6049f67eb4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/bootstrap/bootstrap.pri
View File

@ -51,8 +51,7 @@ hpux-acc*|hpuxi-acc* {
LIBS += -lbootstrap LIBS += -lbootstrap
} }
!contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile { !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
else:if(unix|win32-g++*):LIBS_PRIVATE += -lz include($$PWD/../../3rdparty/zlib_dependency.pri)
else:LIBS += zdll.lib
} }
win32:LIBS += -luser32 -lole32 win32:LIBS += -luser32 -lole32