diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 22:35:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 22:35:29 (GMT) |
| commit | e1d18217134e21be0d896ad3022ef1284d23122d (patch) | |
| tree | e6e983d152311aec1a9cb7685f9acd3d98026896 | |
| parent | 2dcdf662eaae913b318ca359770cb189c3f99af5 (diff) | |
| parent | 04ddaa986504e3842920770927cb7247e5e0fb78 (diff) | |
| download | Qt-e1d18217134e21be0d896ad3022ef1284d23122d.zip Qt-e1d18217134e21be0d896ad3022ef1284d23122d.tar.gz Qt-e1d18217134e21be0d896ad3022ef1284d23122d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for ARMV6 drawhelper blending
| -rw-r--r-- | src/gui/painting/qdrawhelper_arm_simd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qdrawhelper_arm_simd.cpp b/src/gui/painting/qdrawhelper_arm_simd.cpp index 806df29..af9854c 100644 --- a/src/gui/painting/qdrawhelper_arm_simd.cpp +++ b/src/gui/painting/qdrawhelper_arm_simd.cpp @@ -201,8 +201,8 @@ argb32constalpha_next_pixel uxtb16 r10, r9 uxtb16 r6, r9, ror #8 - // Negate r11 and extract src alpha - mvn r9, r11 // bitwise not + // Negate r8 and extract src alpha + mvn r9, r8 // bitwise not uxtb r9, r9, ror #24 mla r10, r9, r10, r14 |