summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Further hybrid heap review changesmread2010-09-301-2/+1
| | | | | | | this time, adding a comment to explain a performance improvement Task-number: QT-3967 Reviewed-by: Shane Kearns
* hybrid heap further review changesmread2010-09-303-18/+14
| | | | | | | | | changing the way enums are declared and used. commenting and restricting export macro changes. improved flagging Task-number: QT-3967 Reviewed-by: Shane Kearns
* lower case name for allocator support headermread2010-09-301-0/+0
| | | | | | | Using lower case name, as recommended by review comment Task-number: QT-3967 Reviewed-by: Shane Kearns
* hybrid allocator integration review updatesmread2010-09-304-12/+14
| | | | | | | | Disabling BTrace use in the heap checking macros without disabling any of the rest of the heap checking functionality. Task-number: QT-3967 Reviewed-by: Shane Kearns
* hybrid allocator tuningmread2010-09-302-1/+9
| | | | | | | | | | | | | | | | | | | | | Set various pragmas and defines to tune the hybrid allocator. Performance test was the time takes to allocate or deallocate as appropriate 1,000,000 times from a set of 100,000 pointers, selected at random, with sizes generated randomly with min 2, max 5960, avg 46. The function was exp(8 - log(2 + rand(0..1023))) * rand(1 or 4). The following parameters were chosen: * pragma arm, for ~1.2% * pragma Otime, for ~3% * pragma O2, already the compiler default, just to be sure * all possible slab sizes enabled, for ~1% NB Disabling BTrace would also gain ~1.5%, but that seems like a bad thing to do. Not done. Task-number: QT-3967 Reviewed-by: Shane Kearns
* removing need for u32std.h in s60mainmread2010-09-301-1/+2
| | | | | | | | | | newallocator_hook.cpp had #include <u32std.h> for the definition of SStdEpocThreadCreateInfo. This header is not available in earlier S60 platforms. But we do not need the full definition of SStdEpocThreadCreateInfo, so a forward declaration is used instead. Task-number: QT-3967 Reviewed-by: Shane Kearns
* declaring fast allocation shrink hysteresis valuemread2010-09-301-0/+2
| | | | | | | | | The allocator code copied from 10.1 would have no default value set for KHeapShrinkHysRatio, since it's no longer a patchable constant. This change gives it a value of 0x800, to be tuned for performance. Task-number: QT-3967 Reviewed-by: Shane Kearns
* fast allocator compiling for S60 3.2mread2010-09-304-4/+19
| | | | | | | | The fast allocator on S60 3.2 can't use TChunkCreateInfo. Instead, RChunk::CreateDisconnectedLocal() has to be used Task-number: QT-3967 Reviewed-by: Shane Kearns
* moved fast allocator config to qt_hybridHeap_symbian_p.hmread2010-09-302-6/+6
| | | | | | | | | The fast allocator switch was in qglobal.h, which is unnessarily global. Instead it has been moved to qt_hybridHeap_symbian_p.h, where is has the minimum visibility required. Task-number: QT-3967 Reviewed-by: Shane Kearns
* getting fast allocator to compile on S60 5.0 SDKmread2010-09-306-14/+110
| | | | | | | | This change adds flagging and definitions necessary to get the fast allocator compiling on 5.0 Task-number: QT-3967 Reviewed-by: Shane Kearns
* removing header use not in public SDKsmread2010-09-301-1/+5
| | | | | | | | u32exec.h was not available in the symbian^3 SDK, so it has been removed and other necessary headers are added. Task-number: QT-3967 Reviewed-by: Shane Kearns
* added header to arch.primread2010-09-301-1/+2
| | | | | | | qt_hybridHeap_symbian_p.h was missing from arch.pri, added. Task-number: QT-3967 Reviewed-by: Shane Kearns
* added renamed headermread2010-09-301-0/+77
| | | | | | | | | qt_hybridHeap_symbian_p.h was renamed from qt_hybridHeap_symbian.h to make it clear that it's private/internal. But it hadn't been added to git. Now it is. Task-number: QT-3967 Reviewed-by: Shane Kearns
* new allocator tidy up and winscw freezemread2010-09-307-87/+13
| | | | | | | | | renamed headers diabaled new allocator for winscw builds, and froze the heap creation export Task-number: QT-3967 Reviewed-by: Shane Kearns
* Qt apps to use the Symbian^4 fast allocator in pre-Symbian^4 platformsmread2010-09-3015-3618/+5626
| | | | | | | | | 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
* Enable call stack tracing of allocs, for memory leak debuggingShane Kearns2010-09-303-21/+55
| | | | | Task-number: QT-3967 Reviewed-by: mread
* Fix BTRACE loggingShane Kearns2010-09-302-112/+77
| | | | | Task-number: QT-3967 Reviewed-by: mread
* Implement RNewAllocator::Available for Doug Lea sectionShane Kearns2010-09-302-7/+11
| | | | | Task-number: QT-3967 Reviewed-by: mread
* Fill in some of the missing functionsShane Kearns2010-09-301-5/+24
| | | | | Task-number: QT-3967 Reviewed-by: mread
* Fix bug where negative numbers are cast to unsigned and added as an offsetShane Kearns2010-09-301-1/+1
| | | | | | | It worked, but relied on integer overflow and casting behaviour Task-number: QT-3967 Reviewed-by: mread
* Code cleanupShane Kearns2010-09-304-19/+22
| | | | | Task-number: QT-3967 Reviewed-by: mread
* Add the new allocator to corelibShane Kearns2010-09-307-2/+4361
| | | | | | | | | | | | | | | | | | | | | 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
* Fix QApplication::desktop()->availableGeometry() for SymbianMiikka Heikkinen2010-09-301-0/+3
| | | | | | | | | | | | | Since screen geometry changes before client area geometry is changed in Eikon, we need to send two resize events, one for screen area change and one for client area change. Note that the correct way to detect client area change in applications is to connect to QApplication::desktop() signal workAreaResized(int) instead of filtering for resize events meant for QDesktopWidget. Task-number: QTBUG-14058 Reviewed-by: Jason Barron
* QS60Style: Possible NULL pointer use when drawing frameSami Merila2010-09-301-1/+1
| | | | | | | | | QS60Style::drawControl casts QStyleOption pointer to QStyleOptionFrame, yet never checks if the orginal pointer was NULL or not. The casted pointer is then used to fetch palette information from style option. Thus, this might lead to crash. Reviewed-by: Miikka Heikkinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-285-3/+23
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix QFontMetrics::lineWidth() for fonts with defined point size Implemeting, exporting and autotesting QFont::lastResortFont() Fixed compile error on non-Symbian platforms. Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
| * Fix QFontMetrics::lineWidth() for fonts with defined point sizeAlessandro Portale2010-09-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontMetrics::lineWidth() and ::underlinePos() return value 1 regardless of the font size if the size was defined in points (instead of pixels). (On Symbian) QFontMetrics::lineWidth() calls QFontEngine::lineThickness() which uses its fontDef.pixelSize in order to come up with a suitable line width. If the QFont size was defined in points, Qt needs to make sure that fontDef.pixelSize is set accordingly. This patch adds the code to make sure that QFontEngine::fontDef always has a valid pixel size. tst_QFontMetrics::lineWidth() was added, wich failed before and passes after this patch. Task-Number: QTBUG-13009 Autotest: Passes Reviewed-By: Eskil
| * Implemeting, exporting and autotesting QFont::lastResortFont()Alessandro Portale2010-09-283-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An implementation of QFont::lastResortFont() is still(!) missing in Qt 4.7.0. I only became aware of QTBUG-6921, lately. This patch... 1) implements QFont::lastResortFont() in qfont_s60.cpp by first trying to get the lastResortFamily() and then falling back to a hardcoded font. 2) updates the .def files with one additional entry 3) adds an autotest which verifies that lastResortFamily() does return a non-empty string. In the firt place, that autotest makes sure that lastResortFamily() is implemented and exported, so that something like this issue will not go unnoticed in the next Qt port. Task-number: QTBUG-6921 Reviewed-by: Eskil
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-271-2/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed regression when typing in QTextControl based widgets on Symbian Fixed incorrect snippet in BLD_INF_RULES documentation Streamlined smart installer package creation
| | * Fixed regression when typing in QTextControl based widgets on Symbianaxis2010-09-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The bug was that when querying for the maximum text length, the case where an invalid QVariant was returned (which is allowed) was not handled properly. This would lead to input being blocked by the input context when it shouldn't. RevBy: Sami Merila
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-2848-4609/+691
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compile warnings (unused variables). Removing libconninet 3rdparty component. Closes properly the dbus connection in icd backend Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD. Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| * | Fix compile warnings (unused variables).Aaron McCarthy2010-09-282-1/+9
| | |
| * | Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2843-4595/+650
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of libconninet caused Qt to have a cyclic build dependency. Which was solved by embedding a copy as a 3rd party library. Maemo has since donated the libconninet code to Qt because (1) it was a private Maemo API and (2) the Qt ICD plugin is the only user of the library. This commit moves the relevent code from src/3rdparty/libconninet to src/plugins/bearer/icd and deletes the rest. Task-number: QT-3893
| * | Closes properly the dbus connection in icd backendAaron McCarthy2010-09-281-0/+2
| | |
| * | Connect/Disconnect requests needs to use the same dbus connection to ICD for ↵Aaron McCarthy2010-09-282-5/+6
| | | | | | | | | | | | | | | | | | the refcounting to work in ICD. Fixes NB#188145 - Network interface doesn't go down after last client disconnects
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-274-8/+24
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Added my changes to the changelog. Clarified documentation of loadFinished() signal. Added a condition to skip obsolete functions during the threadness check. Doc: call qApp->precessEvents after QSplashScreen::showMessage Doc: Said that QApplication exits when not able to open X11 display Doc: maintainance - fixing grammar and spelling Doc: Added a note to qmake INSTALLS docs Doc: Fixing overlapping text problem in columns Doc: Added info on QWidget::render to printing docs Added default value documentation for two variables.
| | * Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-273-2/+13
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-261-8/+11
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2459-410/+1006
| | |\ \ \
| | * | | | Clarified documentation of loadFinished() signal.Jerome Pasion2010-09-241-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:David Boddie Task: QTBUG-10178
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2437-258/+234
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2237-258/+234
| | | |\ \ \ \
| | * | | | | | Doc: call qApp->precessEvents after QSplashScreen::showMessageGeir Vattekar2010-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13734 Reviewed-by: Jerome Pasion
| | * | | | | | Doc: Said that QApplication exits when not able to open X11 displayGeir Vattekar2010-09-241-0/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13377 Reviewed-by: Jerome Pasion
| | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-215-13/+40
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2029-251/+742
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'doc-4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-201-3/+4
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'doc-4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Jerome Pasion2010-09-2054-3632/+1690
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Added default value documentation for two variables.Jerome Pasion2010-09-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie:
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-272-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add export to QDeclarativeBasePositioner Fix assert when placing a .qml file inside $QTDIR/imports
| * | | | | | | | | | Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bauhaus needs this export to manage layouts.