diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-09 19:14:58 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-22 20:56:38 +0200 |
| commit | 6049f67eb4196475096074c1ff7e05fb417eae3b (patch) | |
| tree | 94df2d08274b5791e8a8a0b4aa90daf781e6735f /src | |
| parent | 0390b02a7fdf96dc8b403e4634f62bf0a08ab94d (diff) | |
Fix compilation on Linux: link to zlib in the bootstrapped tools.
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 7de9a2420a..f6f8eba82b 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -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 |