summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2010-09-22 12:27:15 (GMT)
committermread <qt-info@nokia.com>2010-09-30 14:48:29 (GMT)
commit40b413ca994fd26404672cefa71dc36fd2626b67 (patch)
tree32f53649c4548ecce80e031e882fca1f87dd9958 /src/corelib/global
parent3579fd98fbaf95d7dfc4d05f34e00353a295d340 (diff)
downloadQt-40b413ca994fd26404672cefa71dc36fd2626b67.zip
Qt-40b413ca994fd26404672cefa71dc36fd2626b67.tar.gz
Qt-40b413ca994fd26404672cefa71dc36fd2626b67.tar.bz2
Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platforms
The hybrid heap allocator has been copied from Symbian^4 (MCL wk36 initially) and is installed by qtmain.lib as the initial allocator for Qt apps. Task-number: QT-3967 Reviewed-by: Shane Kearns
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 9c90fbf..45ca28e 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2451,9 +2451,11 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
#endif
#endif
+#ifndef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
//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