diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-16 14:51:48 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-16 14:51:48 (GMT) |
| commit | 53babeb551ab8b3444e000828299b336aa080aaf (patch) | |
| tree | 979df5b70e2953c84c5ea873e21d9b1323d3b36e /src/gui/painting | |
| parent | b5b3e65f6e0392239621a3888d9aa58746f3899e (diff) | |
| parent | ea97637bbdb8a2cab2273b68668b3cad8cf0dfd0 (diff) | |
| download | Qt-53babeb551ab8b3444e000828299b336aa080aaf.zip Qt-53babeb551ab8b3444e000828299b336aa080aaf.tar.gz Qt-53babeb551ab8b3444e000828299b336aa080aaf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 024a69d..62af212 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -7711,17 +7711,6 @@ void qInitDrawhelperAsm() } #endif #endif // SSE -#if defined(QT_HAVE_MMXEXT) && defined(QT_HAVE_SSE) - } else if (features & MMXEXT) { - qt_memfill32 = qt_memfill32_sse; - qDrawHelper[QImage::Format_RGB16].bitmapBlit = qt_bitmapblit16_sse; -# ifdef QT_HAVE_3DNOW - if (features & MMX3DNOW) { - qt_memfill32 = qt_memfill32_sse3dnow; - qDrawHelper[QImage::Format_RGB16].bitmapBlit = qt_bitmapblit16_sse3dnow; - } -# endif // 3DNOW -#endif // MMXEXT } #ifdef QT_HAVE_MMX if (features & MMX) { |