summaryrefslogtreecommitdiffstats
path: root/src/s60main/s60main.pro
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-10-28 09:41:17 (GMT)
committermread <qt-info@nokia.com>2010-09-30 14:48:22 (GMT)
commit6dc208237977886056622b307941900658288e13 (patch)
treed1c8c6fa652b03a9cae45b7327f658ef26151146 /src/s60main/s60main.pro
parent6d5309c2fbdbf15948b430de103f393c5af5b7cd (diff)
downloadQt-6dc208237977886056622b307941900658288e13.zip
Qt-6dc208237977886056622b307941900658288e13.tar.gz
Qt-6dc208237977886056622b307941900658288e13.tar.bz2
Add the new allocator to corelib
New export in corelib that is called from the qtmain wrapper to setup the thread heap. This allows 7k of code to be shared, and makes it easier to disable or upgrade the allocator in future releases Task-number: QTBUG-4895 Enable new allocator by default Rename of headers as _p.h to avoid syncqt adding them to applications move inline functions from .inl -> .h, document & rename macros remove #if 0 from the dla header, implement getpagesize properly squashed after sanitisation Task-number: QT-3967 Reviewed-by: mread
Diffstat (limited to 'src/s60main/s60main.pro')
-rw-r--r--src/s60main/s60main.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index a273897..664f155 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -14,7 +14,8 @@ symbian {
CONFIG -= jpeg
INCLUDEPATH += tmp $$QMAKE_INCDIR_QT/QtCore $$MW_LAYER_SYSTEMINCLUDE
SOURCES = qts60main.cpp \
- qts60main_mcrt0.cpp
+ qts60main_mcrt0.cpp \
+ newallocator_hook.cpp
# s60main needs to be built in ARM mode for GCCE to work.
CONFIG += do_not_build_as_thumb