diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-01-06 15:49:21 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-01-06 15:49:21 (GMT) |
| commit | 2399046fbc9dc2c9f7250a43a83ce6f800b59922 (patch) | |
| tree | f256e007fd022fc790071336b418adbe5ae6a58e | |
| parent | 6f173f9686bb3be19b26215342699705765937d3 (diff) | |
| download | Qt-2399046fbc9dc2c9f7250a43a83ce6f800b59922.zip Qt-2399046fbc9dc2c9f7250a43a83ce6f800b59922.tar.gz Qt-2399046fbc9dc2c9f7250a43a83ce6f800b59922.tar.bz2 | |
Fix build on other platforms than Mac
$CFG_MAC_COCOA has a default value of yes now so be sure we the platform
is Mac before doing anything with it.
Reviewed-by:thiago
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -6911,9 +6911,9 @@ if [ "$CFG_LARGEFILE" = "yes" ]; then fi # if both carbon and cocoa are specified, enable the autodetection code. -if [ "$CFG_MAC_COCOA" = "yes" -a "$CFG_MAC_CARBON" = "yes" ]; then +if [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" -a "$CFG_MAC_CARBON" = "yes" ]; then echo "#define AUTODETECT_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new" -elif [ "$CFG_MAC_COCOA" = "yes" ]; then +elif [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" ]; then echo "#define QT_MAC_USE_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new" fi |