summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash when constructing QThreadStorage after global destructors have runBradley T. Hughes2010-10-061-2/+19
| | | | | | | | | | | | | | | In this particular case, the destructors vector used by QThreadStorageData has already been destroyed, yet a new QThreadStorage is being allocated. This can only happen during global destruction, at which point we assume that there is only one thread. In order to keep QThreadStorage working, we need somewhere to store the data, and the best place we have in this situation is at the tail of the current thread's tls vector. The destructor is ignored, since we have no where to store it, and no way to actually call it. Task-number: QTBUG-10084 Reviewed-by: thiago Reviewed-by: olivier
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-064-31/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fixed a buffer overrun when pasting large data from non-Qt apps Fix copying large data to non-Qt applications fix regexp in "make custom command handling in vc(x)proj files sane" qmake: Include -pthread when reducing duplicate library arguments qmake: Ensure right library order when reducing duplicate libraries rebuild configure.exe make QMAKE_POST_LINK handling in nmake generator sane make custom command handling in vc(x)proj files sane Revert "QWorkspace: fix hardcoded min size overwriting the real min size" QtScript/JavaScriptCore: Backport random number generator seeding fix Fix performance regression in QUuid::createUuid() Update japanese translations. Ensure that the underline is only drawn when expected for an accel Small improvement in the textedit demo My changes for 4.7.1 QWorkspace: fix hardcoded min size overwriting the real min size Doc: Fixing link titles and error color in search results Doc: Implementing features to the search feature. Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle ...
| * Fix performance regression in QUuid::createUuid()Bradley T. Hughes2010-10-051-25/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 4363d4eebce4afd2ce3b3d6da205f8037357099a, createUuid() would create a QFile, open it, read from it, and destroy it. This resulted in a pretty serious performance regression (report says around 2000 times slower, I measured 3600 times slower on my machine). This change creates one QFile per thread (since QFile is not thread safe) and leaves the file open until the thread exits (at which point QThreadStorage deletes the QFile). This approach is around 600 times faster than the current code, which is around 6 times slower than the original. Unfortunately, it is not possible to restore the original performance without reintroducing the problems that the commit mentioned above had fixed. Benchmark is included. Task-number: QTBUG-13877 Reviewed-by: thiago Reviewed-by: mgoetz
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-043-6/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QWorkspace: fix hardcoded min size overwriting the real min size Setting the _NET_WM_STATE Atom only when its not already set Fix focus appearance of tabwidget tabs with QGtkStyle Incorrect selection background for unfocused widgets with GTK Make the OpenSSL library search also hit /lib. Update change log. Fix a link that no longer exists in documentation. Remove obsolete reference to qregexp.tex. Reference to QStringList::find() is incorrect, should be QStringList::filter().
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-10-0111-2/+6452
| | |\
| | * \ Merge commit 'refs/merge-requests/828' of git://gitorious.org/qt/qt into ↵David Boddie2010-10-013-6/+2
| | |\ \ | | | | | | | | | | | | | | | integration
| | | * | Fix a link that no longer exists in documentation.Robin Burchell2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Best to keep them up to date, even though that link isn't really used for anything except to make a point. Task-number: QTWEBSITE-13
| | | * | Remove obsolete reference to qregexp.tex.Robin Burchell2010-09-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | According to history, this file hasn't really been maintained since 3.x times, and hasn't existed in the source tree for quite a while.
| | | * | Reference to QStringList::find() is incorrect, should be QStringList::filter().Robin Burchell2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9248
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adding a threshold for partial updates. Fixed arm X11 build.
| * | | | | Fixed arm X11 build.Samuel Rødal2010-10-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Without we get error: invalid conversion from 'const void*' to 'void*' Reviewed-by: Thiago Macieira
* | | | | fix for USER: 163 panic found on 5800XMmread2010-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NO_NAMED_LOCAL_CHUNKS macro should have been set for S605.0 builds. Also for S60 3.2 and Symbian^2. All are added. Reviewed-by: Shane Kearns
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-043-3/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed library ordering when linking to qtmain. Made javascriptcore depend on corelib. Enable QtOpenGL vector path caching on Symbian/IVE3 Made scripttools disabled on Symbian by default, like on Windows. Got rid of "No such directory" warning when shadow building. Added qmake check for presence of RHttpDownloadMgr header Fixed crash on startup in Symbian debug build fixed hybrid heap Symbian udeb build issues qmediaplayer: show buffer status of 0% Progressive download in Phonon MMF backend: integrated with player Progressive download in Phonon MMF backend: added download managers Remove partial upgrade deployment generation for Webkit
| * | | | Fixed crash on startup in Symbian debug buildGareth Stockwell2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a typo in a debug-only function in the hybrid heap allocator. The typo causes an assertion to fail during startup of applications, when using a debug build of Qt. Reviewed-by: mread
| * | | | fixed hybrid heap Symbian udeb build issuesmread2010-10-013-2/+9
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed name collision with TAllocFail Added definition for EDebugHdrSize and fixed scope issue Added definition for SRAllocatorBurstFail Added a definition for global enum ETHeapBadDebugFailParameter Tested compilation on: Symbian^3 RnD - armv5_urel, armv5_udeb, winscw_urel, winscw_udeb S60 3.1 SDK - armv5_urel, armv5_udeb S60 5.0 SDK - armv5_urel, armv5_udeb Symbian^3 PDK - armv5_urel, armv5_udeb Symbian^4 RnD - armv5_urel, armv5_udeb Basic functional testing on N8 armv5_urel Task-number: QTBUG-14168 Reviewed-by: Shane Kearns
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-013-24/+37
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits) Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem Fixed accessing freed memory in raster engine. Build fix for -qtnamespace. Fixed parsing of SVGs with absolute font sizes. Moving QPdf::stripSpecialCharacter to fontengine Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine" Fixed a layout issue where you could get NaN as dimensions QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions Fix double painting when adding an item into a linear layout Fixed antialiased rasterization bug in raster engine. Fixed potential crash when loading corrupt GIFs. Work around an ATI driver problem with mutli-sampled pbuffers. tst_qstatemachine.cpp: fix compilation with Sun Studio Fixed regression in clipping.qps autotest on 64-bit. Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac. Fixed performance regression in curve stroking. Don't disable texture_from_pixmap on GLX/X11 by default. Avoid creating copy of an image in memory when storing as png Doc update for the support of MSVC 2010 64-bit fix documentation of drawText(int, int, int, int, ... ...
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-303-24/+37
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (24 commits) Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItem Fixed accessing freed memory in raster engine. Build fix for -qtnamespace. Fixed parsing of SVGs with absolute font sizes. Moving QPdf::stripSpecialCharacter to fontengine Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine" Fixed a layout issue where you could get NaN as dimensions QTextCodec: Fix valgrind warning when using QTextCodec in destructions functions Fix double painting when adding an item into a linear layout Fixed antialiased rasterization bug in raster engine. Fixed potential crash when loading corrupt GIFs. Work around an ATI driver problem with mutli-sampled pbuffers. tst_qstatemachine.cpp: fix compilation with Sun Studio Fixed regression in clipping.qps autotest on 64-bit. Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac. Fixed performance regression in curve stroking. Don't disable texture_from_pixmap on GLX/X11 by default. Avoid creating copy of an image in memory when storing as png Doc update for the support of MSVC 2010 64-bit fix documentation of drawText(int, int, int, int, ... ...
| | * | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira
| | * | QTextCodec: Fix valgrind warning when using QTextCodec in destructions ↵Olivier Goffart2010-09-291-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | functions Reviewed-by: Denis
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-0111-2/+6452
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | hybrid heap improvement in the disabling of BTracemread2010-09-302-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using an inline function for noBTrace() which can be optimised to nothing. Task-number: QT-3967 Reviewed-by: Shane Kearns
| * | | 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
| * | | 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-306-87/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3013-3615/+5621
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-305-1/+4303
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Use quint64 (long long) instead of long for the GCC assembly code.Thiago Macieira2010-09-281-1/+1
|/ / | | | | | | | | | | | | | | Windows 64-bit has sizeof(long) == 4, which doesn't match the register size. Task-number: reported on IRC Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-271-3/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch '4.7-upstream' into 4.7-docA-Team2010-09-247-46/+92
| |\
| * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-228-108/+108
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-202-3/+4
| |\ \ \
| * \ \ \ 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-205-29/+41
| | |\ \ \ \
| | * | | | | Added default value documentation for two variables.Jerome Pasion2010-09-171-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie: