diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-01 02:00:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-01 02:00:58 (GMT) |
| commit | 904a8f5a079243a9718898f8ae3f07c6f4e73800 (patch) | |
| tree | 4bf3f547b92dc54e45ef87a5c5421cd0c483f1dd /src/s60installs | |
| parent | 0492f2249395ed4f8d86775aee18ffeb195b30b4 (diff) | |
| parent | d63f3d51fef1ff5a034ee9841663675cc8b28d25 (diff) | |
| download | Qt-904a8f5a079243a9718898f8ae3f07c6f4e73800.zip Qt-904a8f5a079243a9718898f8ae3f07c6f4e73800.tar.gz Qt-904a8f5a079243a9718898f8ae3f07c6f4e73800.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (23 commits)
hybrid heap improvement in the disabling of BTrace
Further hybrid heap review changes
hybrid heap further review changes
lower case name for allocator support header
hybrid allocator integration review updates
hybrid allocator tuning
removing need for u32std.h in s60main
declaring fast allocation shrink hysteresis value
fast allocator compiling for S60 3.2
moved fast allocator config to qt_hybridHeap_symbian_p.h
getting fast allocator to compile on S60 5.0 SDK
removing header use not in public SDKs
added header to arch.pri
added renamed header
new allocator tidy up and winscw freeze
Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platforms
Enable call stack tracing of allocs, for memory leak debugging
Fix BTRACE logging
Implement RNewAllocator::Available for Doug Lea section
Fill in some of the missing functions
...
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtCoreu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtCoreu.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index 0f66d72..5eeb244 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -4482,4 +4482,5 @@ EXPORTS ?textDirection@QLocale@@QBE?AW4LayoutDirection@Qt@@XZ @ 4481 NONAME ; enum Qt::LayoutDirection QLocale::textDirection(void) const ?msecsSinceReference@QElapsedTimer@@QBE_JXZ @ 4482 NONAME ; long long QElapsedTimer::msecsSinceReference(void) const ?selectThread@QEventDispatcherSymbian@@AAEAAVQSelectThread@@XZ @ 4483 NONAME ; class QSelectThread & QEventDispatcherSymbian::selectThread(void) + ?qt_symbian_SetupThreadHeap@@YAHHAAUSStdEpocThreadCreateInfo@@@Z @ 4484 NONAME ; int qt_symbian_SetupThreadHeap(int, struct SStdEpocThreadCreateInfo &) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index 01679be..f496839 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -3711,4 +3711,5 @@ EXPORTS _ZlsR11QDataStreamRK12QEasingCurve @ 3710 NONAME _ZltRK13QElapsedTimerS1_ @ 3711 NONAME _ZrsR11QDataStreamR12QEasingCurve @ 3712 NONAME + _Z26qt_symbian_SetupThreadHeapiR24SStdEpocThreadCreateInfo @ 3713 NONAME |