Fix compilation on Linux: link to zlib in the bootstrapped tools.
authorThiago Macieira <thiago.macieira@intel.com>
Thu, 10 May 2012 02:14:58 +0000 (19:14 -0700)
committerQt by Nokia <qt-info@nokia.com>
Tue, 22 May 2012 18:56:38 +0000 (20:56 +0200)
That "else:" with no first condition is probably throwing qmake
off. The condition was removed in
ad2930f82536c9f5d38b644c5a070ce1248f6ee2.

Change-Id: I6af36e3f673a65a6152fb467162c25afc13b4196
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
src/tools/bootstrap/bootstrap.pri

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