diff options
| author | axis <qt-info@nokia.com> | 2011-02-21 15:14:10 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-02-21 15:14:10 (GMT) |
| commit | 553a35e8ec823da981faf5119a4305268839ecb2 (patch) | |
| tree | 4d93c01da1b10d8a7b543cbd0d27194f991a3097 /src | |
| parent | 4ae3fa3f2a912343b50472c6085ba46b8c6d1e7b (diff) | |
| download | Qt-553a35e8ec823da981faf5119a4305268839ecb2.zip Qt-553a35e8ec823da981faf5119a4305268839ecb2.tar.gz Qt-553a35e8ec823da981faf5119a4305268839ecb2.tar.bz2 | |
Support to build Qt for Symbian on Mac OS X with gcce compiler.
RevBy: axis
RevBy: Morten Johan Sørvig
Conflicts:
configure
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 c2fb16c..d90f455 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -284,7 +284,7 @@ namespace QT_NAMESPACE {} # endif #endif -#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE) +#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) && !defined(QT_BUILD_QMAKE) && !defined(QT_BOOTSTRAPPED) #error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration." #endif |