diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-27 07:40:38 (GMT) |
| commit | e4feb707118947feea8568a82d57a8db6ae59410 (patch) | |
| tree | ecf77b7d677f174b59e1c5110dd7aebee877f02d /src/gui | |
| parent | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (diff) | |
| parent | 2925995de32f76a72fcdd7d577e609a68a517fa1 (diff) | |
| download | Qt-e4feb707118947feea8568a82d57a8db6ae59410.zip Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.gz Qt-e4feb707118947feea8568a82d57a8db6ae59410.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/corelib/global/qglobal.h
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qdrawhelper_arm_simd.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/gui/painting/qdrawhelper_arm_simd.cpp b/src/gui/painting/qdrawhelper_arm_simd.cpp index 61dac5e..2a5f5e4 100644 --- a/src/gui/painting/qdrawhelper_arm_simd.cpp +++ b/src/gui/painting/qdrawhelper_arm_simd.cpp @@ -47,7 +47,26 @@ #ifdef QT_HAVE_ARM_SIMD #if defined(Q_OS_SYMBIAN) -#include <u32std.h> +#if !defined(__SWITCH_TO_ARM) +#ifdef __MARM_THUMB__ +#ifndef __ARMCC__ +#define __SWITCH_TO_ARM asm("push {r0} ");\ + asm("add r0, pc, #4 ");\ + asm("bx r0 ");\ + asm("nop ");\ + asm(".align 2 ");\ + asm(".code 32 ");\ + asm("ldr r0, [sp], #4 ") +#define __END_ARM asm(".code 16 ") +#else +#define __SWITCH_TO_ARM asm(".code 32 "); +#define __END_ARM +#endif // __ARMCC__ +#else +#define __SWITCH_TO_ARM +#define __END_ARM +#endif //__MARM_THUMB__ +#endif #endif #if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT) |