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/gui/painting | |
| 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/gui/painting')
| -rw-r--r-- | src/gui/painting/qblendfunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 0edf256..e0c2d16 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -309,9 +309,9 @@ template <typename T> void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl, const uchar *src = srcPixels + y * sbpl; const uchar *srcEnd = src + srcOffset; while (src < srcEnd) { -#if defined(QT_ARCH_ARM) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) +#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) // non-16-bit aligned memory access is not possible on PowerPC, - // ARM <v6 (QT_ARCH_ARMV6) & SH & AVR32 & SPARC w/GCC + // ARM <v6 (QT_ARCH_ARMV5) & SH & AVR32 & SPARC w/GCC quint16 spix = (quint16(src[2])<<8) + src[1]; #else quint16 spix = *(quint16 *) (src + 1); |