diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-03-05 16:31:32 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-05 16:31:32 (GMT) |
| commit | e489e9bc82823f1922a38f1b0805ac8537b1dc77 (patch) | |
| tree | dfe72a535c3ae63d1e8469a6ab285d6de45f4599 /configure | |
| parent | 0e049a27622a4002af8851fed68f37b71fc7ba54 (diff) | |
| download | Qt-e489e9bc82823f1922a38f1b0805ac8537b1dc77.zip Qt-e489e9bc82823f1922a38f1b0805ac8537b1dc77.tar.gz Qt-e489e9bc82823f1922a38f1b0805ac8537b1dc77.tar.bz2 | |
fixed treatment of zlib on Mac when crossbuilding
Merge-request: 478
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6324,7 +6324,7 @@ else QT_CONFIG="$QT_CONFIG freetype" fi -if [ "x$PLATFORM_MAC" = "xyes" ]; then +if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then #On Mac we implicitly link against libz, so we #never use the 3rdparty stuff. [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" |