From b0df6df2fbbb9bd29fe2cfaed731878171061cbf Mon Sep 17 00:00:00 2001 From: mread Date: Fri, 24 Sep 2010 13:28:14 +0100 Subject: 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 --- src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h | 6 ++++++ src/corelib/global/qglobal.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridHeap_symbian_p.h index 0269adb..e0437f9 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 +#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" diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 3c177ae..35607d5 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2451,12 +2451,6 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #endif #endif -#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 - //Symbian does not support data imports from a DLL #define Q_NO_DATA_RELOCATION -- cgit v0.12