summaryrefslogtreecommitdiffstats
path: root/src/s60main
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/s60main
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/s60main')
-rw-r--r--src/s60main/newallocator_hook.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/s60main/newallocator_hook.cpp b/src/s60main/newallocator_hook.cpp
index 839f79a..9825920 100644
--- a/src/s60main/newallocator_hook.cpp
+++ b/src/s60main/newallocator_hook.cpp
@@ -40,16 +40,17 @@
****************************************************************************/
#include <e32std.h>
#include <qglobal.h>
+#include <u32std.h>
Q_CORE_EXPORT TInt qt_symbian_SetupThreadHeap(TBool aNotFirst, SStdEpocThreadCreateInfo& aInfo);
-/*
- * \internal
+
+/* \internal
*
* Uses link-time symbol preemption to capture a call from the application
* startup. On return, there is some kind of heap allocator installed on the
* thread.
- */
+*/
TInt UserHeap::SetupThreadHeap(TBool aNotFirst, SStdEpocThreadCreateInfo& aInfo)
{
return qt_symbian_SetupThreadHeap(aNotFirst, aInfo);