diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-03-06 20:30:28 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-03-06 20:30:28 (GMT) |
| commit | 670b1cfccd68a69e03544adff5dea1a21dc2b339 (patch) | |
| tree | a4d9f87d690182e14facf41db34c999600bade96 /configure | |
| parent | 35e939a0c9afb29f82e2aba774a117a35ea83a17 (diff) | |
| parent | 64c024d4ef4d80af8f728a684b34057824dcf322 (diff) | |
| download | Qt-670b1cfccd68a69e03544adff5dea1a21dc2b339.zip Qt-670b1cfccd68a69e03544adff5dea1a21dc2b339.tar.gz Qt-670b1cfccd68a69e03544adff5dea1a21dc2b339.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
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" |