diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 17:09:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 17:09:24 (GMT) |
| commit | 98072ecf6a6dc07ac82038adf66048a1c17dbbb5 (patch) | |
| tree | b8e78d73667f919c9ccd55f8cc93f542f7f2fff5 /src/gui/painting | |
| parent | 8c836fa76043c55432dd4b2a1669a895e0758925 (diff) | |
| parent | 7190c7be34fe0dbcfbb10b232b40977c758d251a (diff) | |
| download | Qt-98072ecf6a6dc07ac82038adf66048a1c17dbbb5.zip Qt-98072ecf6a6dc07ac82038adf66048a1c17dbbb5.tar.gz Qt-98072ecf6a6dc07ac82038adf66048a1c17dbbb5.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
[QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)
HTTP cacheing: do not store the date header with the resource
Let's not write to the source buffer when blending argb32 on rgb16.
make -markuntranslated work without -idbased
fix conditional on shell type
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper_neon.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp index 00b103d..debca37 100644 --- a/src/gui/painting/qdrawhelper_neon.cpp +++ b/src/gui/painting/qdrawhelper_neon.cpp @@ -327,10 +327,8 @@ void qt_blend_argb32_on_rgb16_neon(uchar *destPixels, int dbpl, blend_8_pixels_argb32_on_rgb16_neon(dstBuffer, srcBuffer, const_alpha); - for (int j = 0; j < tail; ++j) { + for (int j = 0; j < tail; ++j) dst[i + j] = dstBuffer[j]; - src[i + j] = srcBuffer[j]; - } } dst = (quint16 *)(((uchar *) dst) + dbpl); |