summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMorten Sorvig <msorvig@trolltech.com>2009-08-04 07:31:56 (GMT)
committerMorten Sorvig <msorvig@trolltech.com>2009-08-04 07:31:56 (GMT)
commite83f77cbc22be5e37de1e7a8ec2c55e66f7b51d9 (patch)
treec7c6a740c0048a192c0db21f802f990644cf0b1b /src
parent731b85fa65b9f7234ad299559958a596f8ec5bd9 (diff)
downloadQt-e83f77cbc22be5e37de1e7a8ec2c55e66f7b51d9.zip
Qt-e83f77cbc22be5e37de1e7a8ec2c55e66f7b51d9.tar.gz
Qt-e83f77cbc22be5e37de1e7a8ec2c55e66f7b51d9.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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index f650bd2..e05c05d 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