diff options
| author | Morten Sorvig <msorvig@trolltech.com> | 2009-08-04 07:31:56 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2009-08-04 07:42:51 (GMT) |
| commit | 83a82f900aa63a350b66d90ed55f63ee77f20250 (patch) | |
| tree | 11ce450d27142afc3fd20e75620e0edaeda05a62 /src | |
| parent | 4f7170d9d731234c65008b690a95a0e86d397db5 (diff) | |
| download | Qt-83a82f900aa63a350b66d90ed55f63ee77f20250.zip Qt-83a82f900aa63a350b66d90ed55f63ee77f20250.tar.gz Qt-83a82f900aa63a350b66d90ed55f63ee77f20250.tar.bz2 | |
Build on snow leopard.
Don't error out when building qmake, just let it build a 64-bit binary (even for carbon)
RebBy: Richard Moe Gustavsen
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8263bae..c266ca0 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -279,7 +279,7 @@ namespace QT_NAMESPACE {} # endif #endif -#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) +#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE) #error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration." #endif |