diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-09 02:38:14 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 12:43:47 (GMT) |
| commit | 3464a05a94c4e638d91b2151d6aad70f78ea3087 (patch) | |
| tree | dd3e42066f3b32a7772916e3d5ef14f9206d4ed2 | |
| parent | 4effe88116bc2a21ec44eea9fbc740283cd73190 (diff) | |
| download | Qt-3464a05a94c4e638d91b2151d6aad70f78ea3087.zip Qt-3464a05a94c4e638d91b2151d6aad70f78ea3087.tar.gz Qt-3464a05a94c4e638d91b2151d6aad70f78ea3087.tar.bz2 | |
Add an error message for building architecture mismatch
Snow Leopard defaults to 64-bit if you don't specify an architecture,
whereas in the past it defaulted to 32-bit. This isn't a problem for Qt
per-se. It *is* a problem if you just build an application that uses Qt
but isn't using qmake stuff. To help in those situations, we should
error out to let the person know that they need to change their
configuration (in any case, the headers are going to complain and they
get a much more cryptic message).
Reviewed by: Morten Sørvig
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index f834bc7..b8a9024 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -279,6 +279,10 @@ namespace QT_NAMESPACE {} # endif #endif +#if defined(Q_OS_MAC64) && !defined(QT_MAC_USE_COCOA) +#error "You are building a 64-bit application, but using a 32-bit version of Qt. Check your build configuration." +#endif + #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) # undef Q_OS_UNIX #elif !defined(Q_OS_UNIX) |