diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2012-01-18 17:21:04 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 18:40:45 +0100 |
| commit | 9e940ec8fc9217f255494006a94c4446e7b4ba45 (patch) | |
| tree | b3343acc1a3689d8573f9049007ff3ed94d1d9ef /src/corelib/global/qglobal.h | |
| parent | 253c801c56bbe9fb221ee20e5b4df2368c90b365 (diff) | |
Remove Q_CC_NOKIAX86.
This is no longer supported.
Change-Id: Ic393bc48c4c842514da69b6696cfb62b54360070
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index fd5c5d6315..4c8e3368b0 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -760,9 +760,6 @@ namespace QT_NAMESPACE {} # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ -#elif defined(__WINSCW__) && !defined(Q_CC_NOKIAX86) -# define Q_CC_NOKIAX86 - #else # error "Qt has not been tested with this compiler - talk to qt-info@nokia.com" #endif @@ -1220,7 +1217,7 @@ class QDataStream; #endif #ifndef Q_DECL_EXPORT -# if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# if defined(Q_OS_WIN) || defined(Q_CC_RVCT) # define Q_DECL_EXPORT __declspec(dllexport) # elif defined(QT_VISIBILITY_AVAILABLE) # define Q_DECL_EXPORT __attribute__((visibility("default"))) @@ -1231,7 +1228,7 @@ class QDataStream; # endif #endif #ifndef Q_DECL_IMPORT -# if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# if defined(Q_OS_WIN) || defined(Q_CC_RVCT) # define Q_DECL_IMPORT __declspec(dllimport) # else # define Q_DECL_IMPORT @@ -1797,7 +1794,7 @@ inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; } # endif /* The MIPSpro and RVCT compilers postpones macro expansion, and therefore macros must be in scope when being used. */ -# if !defined(Q_CC_MIPS) && !defined(Q_CC_RVCT) && !defined(Q_CC_NOKIAX86) +# if !defined(Q_CC_MIPS) && !defined(Q_CC_RVCT) # undef QT_STRINGIFY2 # undef QT_STRINGIFY # endif |