diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2012-01-18 13:43:47 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 21:13:48 +0100 |
| commit | ce14c36475643c4b30fd8d0a52e8d73137047f9e (patch) | |
| tree | 46db8c7017d193a75eb5fc089187b84b7fc6e4e6 /src/corelib/global | |
| parent | 9e940ec8fc9217f255494006a94c4446e7b4ba45 (diff) | |
Remove Q_CC_MWERKS.
This is no longer supported.
Change-Id: I3914f5007595fd699fa1e9a565a0a3f59a0e135e
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 26 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 12 |
2 files changed, 2 insertions, 36 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index f8fc49ddbf..cc492f1dfe 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1232,14 +1232,6 @@ bool qSharedBuild() */ /*! - \macro Q_CC_MWERKS - \relates <QtGlobal> - - Defined if the application is compiled using Metrowerks - CodeWarrior. -*/ - -/*! \macro Q_CC_MSVC \relates <QtGlobal> @@ -1722,20 +1714,6 @@ void *qMemSet(void *dest, int c, size_t n) { return memset(dest, c, n); } static QtMsgHandler handler = 0; // pointer to debug handler -#if defined(Q_CC_MWERKS) && defined(Q_OS_MACX) -extern bool qt_is_gui_used; -static void mac_default_handler(const char *msg) -{ - if (qt_is_gui_used) { - Str255 pmsg; - qt_mac_to_pascal_string(msg, pmsg); - DebugStr(pmsg); - } else { - fprintf(stderr, msg); - } -} -#endif // Q_CC_MWERKS && Q_OS_MACX - #if !defined(Q_OS_WIN) && !defined(QT_NO_THREAD) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_QNX) && \ defined(_POSIX_THREAD_SAFE_FUNCTIONS) && _POSIX_VERSION >= 200112L namespace { @@ -1859,9 +1837,7 @@ extern Q_CORE_EXPORT void qWinMsgHandler(QtMsgType t, const char* str); */ static void qDefaultMsgHandler(QtMsgType, const char *buf) { -#if defined(Q_CC_MWERKS) && defined(Q_OS_MACX) - mac_default_handler(buf); -#elif defined(Q_OS_WINCE) +#if defined(Q_OS_WINCE) QString fstr = QString::fromLatin1(buf); fstr += QLatin1Char('\n'); OutputDebugString(reinterpret_cast<const wchar_t *> (fstr.utf16())); diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 4c8e3368b0..2b868df75d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -210,8 +210,6 @@ namespace QT_NAMESPACE {} # else # define Q_OS_WIN32 # endif -#elif defined(__MWERKS__) && defined(__INTEL__) -# define Q_OS_WIN32 #elif defined(__sun) || defined(sun) # define Q_OS_SOLARIS #elif defined(hpux) || defined(__hpux) @@ -330,7 +328,6 @@ namespace QT_NAMESPACE {} The compiler, must be one of: (Q_CC_x) SYM - Digital Mars C/C++ (used to be Symantec C++) - MWERKS - Metrowerks CodeWarrior MSVC - Microsoft Visual C/C++, Intel C++ for Windows BOR - Borland/Turbo C++ WAT - Watcom C++ @@ -367,13 +364,6 @@ namespace QT_NAMESPACE {} # endif # define Q_NO_USING_KEYWORD -#elif defined(__MWERKS__) -# define Q_CC_MWERKS -# if defined(__EMU_SYMBIAN_OS__) -# define Q_CC_NOKIAX86 -# endif -/* "explicit" recognized since 4.0d1 */ - #elif defined(_MSC_VER) # define Q_CC_MSVC # define Q_CC_MSVC_NET @@ -890,7 +880,7 @@ typedef short qint16; /* 16 bit signed */ typedef unsigned short quint16; /* 16 bit unsigned */ typedef int qint32; /* 32 bit signed */ typedef unsigned int quint32; /* 32 bit unsigned */ -#if defined(Q_OS_WIN) && !defined(Q_CC_GNU) && !defined(Q_CC_MWERKS) +#if defined(Q_OS_WIN) && !defined(Q_CC_GNU) # define Q_INT64_C(c) c ## i64 /* signed 64 bit constant */ # define Q_UINT64_C(c) c ## ui64 /* unsigned 64 bit constant */ typedef __int64 qint64; /* 64 bit signed */ |