diff options
| author | mread <qt-info@nokia.com> | 2011-02-03 14:51:48 +0000 |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2011-02-03 14:51:48 +0000 |
| commit | a496c01470e609cd385c725bccc72e33430d4038 (patch) | |
| tree | 5cf8f2880a56dee5e2ee953c298b3b0906573081 | |
| parent | 08ec37f964361b9907292277f851de9e08032964 (diff) | |
| download | qt4-tools-a496c01470e609cd385c725bccc72e33430d4038.tar.gz | |
Using a better flag to control the fast allocator
The Qt fast allocator should be used on any Symbian platform where it
is not supplied by euser. But it's better if the code is not there when
euser provides the fast allocator as euser's implementation will be
better maintained.
The previous flag SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS was only associated
with euser's fast allocator in S60 10.1. __SYMBIAN_KERNEL_HYBRID_HEAP__
is more accurately associated with it in the new MCL.
Task-number: QTBUG-15901
Reviewed-by: Miikka Heikkinen
| -rw-r--r-- | src/corelib/arch/symbian/qt_hybridheap_symbian_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h index 4eff0f38be..d1ce7056f4 100644 --- a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h +++ b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h @@ -43,8 +43,9 @@ #define QT_HYBRIDHEAP_SYMBIAN_H #include <qglobal.h> +#include <e32cmn.h> -#if !defined(SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS) && !defined(__WINS__) +#if !defined(__SYMBIAN_KERNEL_HYBRID_HEAP__) && !defined(__WINS__) //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 |