diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
commit | 0832d7209e3aee7055fb39339030ff6842f4117d (patch) | |
tree | 75ec174a5492d0ddc52bc2f4dcdef363714a63cb /src/corelib/global/qglobal.h | |
parent | ad0d0c4b6f7958b3cde01855b0f3b9c68db5253a (diff) | |
parent | df28c1203e12c572f795b8d114254a8e5a6619e8 (diff) | |
download | Qt-0832d7209e3aee7055fb39339030ff6842f4117d.zip Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.gz Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.bz2 |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
src/gui/image/image.pri
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r-- | src/corelib/global/qglobal.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 00ba5c3..59b2a34 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -414,15 +414,13 @@ namespace QT_NAMESPACE {} # if defined(__INTEL_COMPILER) # define Q_CC_INTEL # endif -/* x64 does not support mmx intrinsics on windows */ -# if (defined(Q_OS_WIN64) && defined(_M_X64)) +/* MSVC does not support SSE/MMX on x64 */ +# if (defined(Q_CC_MSVC) && defined(_M_X64)) # undef QT_HAVE_SSE -# undef QT_HAVE_SSE2 # undef QT_HAVE_MMX # undef QT_HAVE_3DNOW # endif - #elif defined(__BORLANDC__) || defined(__TURBOC__) # define Q_CC_BOR # define Q_INLINE_TEMPLATE @@ -1070,10 +1068,11 @@ redefine to built-in booleans to make autotests work properly */ //the alignment needs to be forced for sse2 to not crash with mingw #if defined(Q_WS_WIN) # if defined(Q_CC_MINGW) -# define QT_WIN_CALLBACK CALLBACK __attribute__ ((force_align_arg_pointer)) +# define QT_ENSURE_STACK_ALIGNED_FOR_SSE __attribute__ ((force_align_arg_pointer)) # else -# define QT_WIN_CALLBACK CALLBACK +# define QT_ENSURE_STACK_ALIGNED_FOR_SSE # endif +# define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE #endif typedef int QNoImplicitBoolCast; |