diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-04 03:37:55 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-04 03:37:55 (GMT) |
| commit | 5974c8a7216459e1ce820c42e448b49cea49a778 (patch) | |
| tree | 721cdd001e94dd15efed68c1dc82bcc73cf3d2db /src/gui/painting/qdrawhelper_mmx_p.h | |
| parent | f2d3043e72dbfd9281925ccda76840dfd35ff38f (diff) | |
| parent | 89ce8d3b2a389a405f97d42bafa47ef244324822 (diff) | |
| download | Qt-5974c8a7216459e1ce820c42e448b49cea49a778.zip Qt-5974c8a7216459e1ce820c42e448b49cea49a778.tar.gz Qt-5974c8a7216459e1ce820c42e448b49cea49a778.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/painting/qdrawhelper_mmx_p.h')
| -rw-r--r-- | src/gui/painting/qdrawhelper_mmx_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper_mmx_p.h b/src/gui/painting/qdrawhelper_mmx_p.h index e107c72..68d9ec0 100644 --- a/src/gui/painting/qdrawhelper_mmx_p.h +++ b/src/gui/painting/qdrawhelper_mmx_p.h @@ -65,7 +65,7 @@ #define C_80 const m64 mmx_0x0080 = _mm_set1_pi16(0x80) #define C_00 const m64 mmx_0x0000 = _mm_setzero_si64() -#if defined(Q_OS_WIN) +#ifdef Q_CC_MSVC # pragma warning(disable: 4799) // No EMMS at end of function #endif |