diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-09-29 14:29:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-10 07:47:58 +0200 |
| commit | 9fa6e8f627d0c61fd5a3b993903a362dc04bf707 (patch) | |
| tree | 56858ef0994ef4b300d5f6928fa51b0844bf1861 /src/corelib/global/qglobal.h | |
| parent | 33233ca3e3d79152744eedd353106c5d95737e00 (diff) | |
Clean-up a macro for Cocoa
Remove the usage of Q_MAC_USE_COCOA and Carbon code paths.
Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112
Reviewed-on: http://codereview.qt-project.org/5100
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 228c9a3469..b079e317d7 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -298,10 +298,6 @@ namespace QT_NAMESPACE {} # endif #endif -#if defined(Q_WS_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 - #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) # undef Q_OS_UNIX #elif !defined(Q_OS_UNIX) @@ -2740,7 +2736,6 @@ QT_LICENSED_MODULE(Sensors) #endif #if !(defined(Q_WS_WIN) && !defined(Q_WS_WINCE)) \ - && !(defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)) \ && !(defined(Q_WS_X11) && !defined(QT_NO_FREETYPE)) \ && !(defined(Q_WS_QPA)) # define QT_NO_RAWFONT |