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>
This commit is contained in:
parent
9e940ec8fc
commit
ce14c36475
@ -1231,14 +1231,6 @@ bool qSharedBuild()
|
|||||||
(used to be Symantec C++).
|
(used to be Symantec C++).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*!
|
|
||||||
\macro Q_CC_MWERKS
|
|
||||||
\relates <QtGlobal>
|
|
||||||
|
|
||||||
Defined if the application is compiled using Metrowerks
|
|
||||||
CodeWarrior.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\macro Q_CC_MSVC
|
\macro Q_CC_MSVC
|
||||||
\relates <QtGlobal>
|
\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
|
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) && \
|
#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
|
defined(_POSIX_THREAD_SAFE_FUNCTIONS) && _POSIX_VERSION >= 200112L
|
||||||
namespace {
|
namespace {
|
||||||
@ -1859,9 +1837,7 @@ extern Q_CORE_EXPORT void qWinMsgHandler(QtMsgType t, const char* str);
|
|||||||
*/
|
*/
|
||||||
static void qDefaultMsgHandler(QtMsgType, const char *buf)
|
static void qDefaultMsgHandler(QtMsgType, const char *buf)
|
||||||
{
|
{
|
||||||
#if defined(Q_CC_MWERKS) && defined(Q_OS_MACX)
|
#if defined(Q_OS_WINCE)
|
||||||
mac_default_handler(buf);
|
|
||||||
#elif defined(Q_OS_WINCE)
|
|
||||||
QString fstr = QString::fromLatin1(buf);
|
QString fstr = QString::fromLatin1(buf);
|
||||||
fstr += QLatin1Char('\n');
|
fstr += QLatin1Char('\n');
|
||||||
OutputDebugString(reinterpret_cast<const wchar_t *> (fstr.utf16()));
|
OutputDebugString(reinterpret_cast<const wchar_t *> (fstr.utf16()));
|
||||||
|
@ -210,8 +210,6 @@ namespace QT_NAMESPACE {}
|
|||||||
# else
|
# else
|
||||||
# define Q_OS_WIN32
|
# define Q_OS_WIN32
|
||||||
# endif
|
# endif
|
||||||
#elif defined(__MWERKS__) && defined(__INTEL__)
|
|
||||||
# define Q_OS_WIN32
|
|
||||||
#elif defined(__sun) || defined(sun)
|
#elif defined(__sun) || defined(sun)
|
||||||
# define Q_OS_SOLARIS
|
# define Q_OS_SOLARIS
|
||||||
#elif defined(hpux) || defined(__hpux)
|
#elif defined(hpux) || defined(__hpux)
|
||||||
@ -330,7 +328,6 @@ namespace QT_NAMESPACE {}
|
|||||||
The compiler, must be one of: (Q_CC_x)
|
The compiler, must be one of: (Q_CC_x)
|
||||||
|
|
||||||
SYM - Digital Mars C/C++ (used to be Symantec C++)
|
SYM - Digital Mars C/C++ (used to be Symantec C++)
|
||||||
MWERKS - Metrowerks CodeWarrior
|
|
||||||
MSVC - Microsoft Visual C/C++, Intel C++ for Windows
|
MSVC - Microsoft Visual C/C++, Intel C++ for Windows
|
||||||
BOR - Borland/Turbo C++
|
BOR - Borland/Turbo C++
|
||||||
WAT - Watcom C++
|
WAT - Watcom C++
|
||||||
@ -367,13 +364,6 @@ namespace QT_NAMESPACE {}
|
|||||||
# endif
|
# endif
|
||||||
# define Q_NO_USING_KEYWORD
|
# 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)
|
#elif defined(_MSC_VER)
|
||||||
# define Q_CC_MSVC
|
# define Q_CC_MSVC
|
||||||
# define Q_CC_MSVC_NET
|
# define Q_CC_MSVC_NET
|
||||||
@ -890,7 +880,7 @@ typedef short qint16; /* 16 bit signed */
|
|||||||
typedef unsigned short quint16; /* 16 bit unsigned */
|
typedef unsigned short quint16; /* 16 bit unsigned */
|
||||||
typedef int qint32; /* 32 bit signed */
|
typedef int qint32; /* 32 bit signed */
|
||||||
typedef unsigned int quint32; /* 32 bit unsigned */
|
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_INT64_C(c) c ## i64 /* signed 64 bit constant */
|
||||||
# define Q_UINT64_C(c) c ## ui64 /* unsigned 64 bit constant */
|
# define Q_UINT64_C(c) c ## ui64 /* unsigned 64 bit constant */
|
||||||
typedef __int64 qint64; /* 64 bit signed */
|
typedef __int64 qint64; /* 64 bit signed */
|
||||||
|
@ -357,7 +357,7 @@ static QString readSymLink(const QFileSystemEntry &link)
|
|||||||
static QString readLink(const QFileSystemEntry &link)
|
static QString readLink(const QFileSystemEntry &link)
|
||||||
{
|
{
|
||||||
#if !defined(Q_OS_WINCE)
|
#if !defined(Q_OS_WINCE)
|
||||||
#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS)
|
#if !defined(QT_NO_LIBRARY)
|
||||||
QString ret;
|
QString ret;
|
||||||
|
|
||||||
bool neededCoInit = false;
|
bool neededCoInit = false;
|
||||||
|
@ -614,7 +614,7 @@ bool QFSFileEnginePrivate::doStat(QFileSystemMetaData::MetaDataFlags flags) cons
|
|||||||
bool QFSFileEngine::link(const QString &newName)
|
bool QFSFileEngine::link(const QString &newName)
|
||||||
{
|
{
|
||||||
#if !defined(Q_OS_WINCE)
|
#if !defined(Q_OS_WINCE)
|
||||||
#if !defined(QT_NO_LIBRARY) && !defined(Q_CC_MWERKS)
|
#if !defined(QT_NO_LIBRARY)
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
|
||||||
QString linkName = newName;
|
QString linkName = newName;
|
||||||
|
@ -866,7 +866,7 @@ bool QUuid::operator>(const QUuid &other) const
|
|||||||
|
|
||||||
\sa variant(), version()
|
\sa variant(), version()
|
||||||
*/
|
*/
|
||||||
#if defined(Q_OS_WIN32) && ! defined(Q_CC_MWERKS)
|
#if defined(Q_OS_WIN32)
|
||||||
|
|
||||||
QT_BEGIN_INCLUDE_NAMESPACE
|
QT_BEGIN_INCLUDE_NAMESPACE
|
||||||
#include <objbase.h> // For CoCreateGuid
|
#include <objbase.h> // For CoCreateGuid
|
||||||
|
@ -258,13 +258,6 @@ bool removeGroupSeparators(QLocalePrivate::CharBuff *num)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32)
|
|
||||||
inline bool isascii(int c)
|
|
||||||
{
|
|
||||||
return (c >= 0 && c <=127);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-
|
/*-
|
||||||
* Copyright (c) 1992, 1993
|
* Copyright (c) 1992, 1993
|
||||||
* The Regents of the University of California. All rights reserved.
|
* The Regents of the University of California. All rights reserved.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user