diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-09-22 13:21:57 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2010-09-23 09:21:13 (GMT) |
| commit | 6d1fb317f53017aee99ec191cc8740e7e668ba0e (patch) | |
| tree | 94d0d90df0bb9f0b4218ccc3b77f9cdcd66c5278 /src/corelib/global/qglobal.h | |
| parent | 7be2c5824e0331bbeec87b482e71efe72fb026b0 (diff) | |
| download | Qt-6d1fb317f53017aee99ec191cc8740e7e668ba0e.zip Qt-6d1fb317f53017aee99ec191cc8740e7e668ba0e.tar.gz Qt-6d1fb317f53017aee99ec191cc8740e7e668ba0e.tar.bz2 | |
Fix usage of QT_ARCH_ARM* after a28ddf6
Remove unnecessary use of QT_ARCH_ARMV6 from qglobal.h (QT_ARCH_ARM is
always defined when QT_ARCH_ARMV6 is defined), and fix the use of
QT_ARCH_ARM to assume ARM < v6 in qblendfunctions.cpp (use QT_ARCH_ARMV5
instead).
Reviewed-by: thiago
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index b0a24b0..986b5c5 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1091,7 +1091,7 @@ redefine to built-in booleans to make autotests work properly */ typedef int QNoImplicitBoolCast; -#if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A) +#if defined(QT_ARCH_ARM) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A) #define QT_NO_FPU #endif |