diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 14:55:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-15 14:55:23 (GMT) |
| commit | 7383d4c2d350ee0ac052e2ab3fe7b63ea1eb0185 (patch) | |
| tree | 3ff5438efd21783ca98b6209f44503da254abc6b | |
| parent | af5984ef163894b6eb43894aa4075e947642bb6d (diff) | |
| parent | e0aa9897bc2d04054cc65dbe3452bee2ed2eacd8 (diff) | |
| download | Qt-7383d4c2d350ee0ac052e2ab3fe7b63ea1eb0185.zip Qt-7383d4c2d350ee0ac052e2ab3fe7b63ea1eb0185.tar.gz Qt-7383d4c2d350ee0ac052e2ab3fe7b63ea1eb0185.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent crash in drawhelper code when the cpu has MMXEXT but no SSE.
| -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) { |