diff options
| author | axis <qt-info@nokia.com> | 2010-03-15 11:00:38 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-15 11:00:38 (GMT) |
| commit | b65a79f7079106233e32251e9a6ab0639cdad662 (patch) | |
| tree | 66eb210b7a611a161cc06bf724f61bc5ac710072 /src/corelib/global | |
| parent | fc3f88b5c22c12c8f61da152ca82cb10f18d2902 (diff) | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| download | Qt-b65a79f7079106233e32251e9a6ab0639cdad662.zip Qt-b65a79f7079106233e32251e9a6ab0639cdad662.tar.gz Qt-b65a79f7079106233e32251e9a6ab0639cdad662.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 4d48b60..6437fb7 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1064,6 +1064,16 @@ redefine to built-in booleans to make autotests work properly */ # define QT_FASTCALL #endif +//defines the type for the WNDPROC on windows +//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)) +# else +# define QT_WIN_CALLBACK CALLBACK +# endif +#endif + typedef int QNoImplicitBoolCast; #if defined(QT_ARCH_ARM) || defined(QT_ARCH_ARMV6) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE))) || defined(QT_ARCH_SH) || defined(QT_ARCH_SH4A) |