summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch/symbian
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2010-09-24 13:28:14 +0100
committermread <qt-info@nokia.com>2010-09-30 15:48:35 +0100
commitb0df6df2fbbb9bd29fe2cfaed731878171061cbf (patch)
tree3f76e4c7b0e69c3841b4e7461241f5c2bfb31b0f /src/corelib/arch/symbian
parent91b7fef1dff86eac3e210a322208405b44f5c580 (diff)
moved fast allocator config to qt_hybridHeap_symbian_p.h
The fast allocator switch was in qglobal.h, which is unnessarily global. Instead it has been moved to qt_hybridHeap_symbian_p.h, where is has the minimum visibility required. Task-number: QT-3967 Reviewed-by: Shane Kearns
Diffstat (limited to 'src/corelib/arch/symbian')
-rw-r--r--src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h
index 0269adb642..e0437f9bb2 100644
--- a/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h
+++ b/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h
@@ -44,6 +44,12 @@
#include <qglobal.h>
+#if !defined(SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS) && !defined(__WINSCW__)
+//Enable the (backported) new allocator. When it is available in OS,
+//this flag should be disabled for that OS version onward
+#define QT_USE_NEW_SYMBIAN_ALLOCATOR
+#endif
+
#ifdef QT_USE_NEW_SYMBIAN_ALLOCATOR
#include "common_p.h"