summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicmread2009-06-184-11/+21
|\
| * make qglobal.h compile when inlcuded from c-filesJanne Koskinen2009-06-171-5/+6
| |
| * namespace fixes. s60main and corelib now compiles under a namespaceJanne Koskinen2009-06-172-4/+6
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-06-172-5/+23
| |\
| | * Fixed indentation.axis2009-06-171-4/+4
| | |
| | * Readded code that was lost during exception integration.axis2009-06-171-0/+3
| | | | | | | | | | | | | | | AutoTest: Passed RevBy: Trust me
| * | Revert "Removed accidental allocation in QRingBuffer::clear()"Janne Koskinen2009-06-171-9/+3
| | | | | | | | | | | | This reverts commit 85e940d2fa5e8d2caf0d157f214bb826fc392e7b.
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-06-152-0/+5
| |\ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-06-15102-1865/+3343
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qringbuffer_p.h
| * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-202-65/+144
| |\ \ \ \
| * | | | | Removed accidental allocation in QRingBuffer::clear()Janne Koskinen2009-05-201-3/+9
| | | | | |
* | | | | | review fixesmread2009-06-182-4/+4
| | | | | |
* | | | | | report and continue policy for exceptions in all Qt threadsmread2009-06-183-19/+42
| |_|_|_|/ |/| | | |
* | | | | doc: document QScopedPointer with forward declared classesHarald Fernengel2009-06-161-1/+16
| |_|_|/ |/| | | | | | | | | | | Also some small doc cleanups
* | | | export qBadAlloc only if exceptions are onHarald Fernengel2009-06-152-0/+5
| |_|/ |/| |
* | | doc: document operator== and !=Harald Fernengel2009-06-151-0/+15
| | |
* | | move QSymbianLeaveException to the *.cpp fileHarald Fernengel2009-06-152-41/+19
| | | | | | | | | | | | | | | don't need to include stl's header in qglobal.h also updated documentation
* | | export QSymbianLeaveExceptionHarald Fernengel2009-06-151-1/+1
| | |
* | | add correct license headersEspen Riskedal2009-06-111-2/+32
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicDavid Boddie2009-06-112-4/+46
|\ \ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicHarald Fernengel2009-06-101-3/+3
| |\ \ \
| | * | | Shrink the emergency qWarning buffer to 256 bytes.Robert Griebl2009-06-101-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Harald Fernengel
| * | | | doc: added code examplesHarald Fernengel2009-06-101-0/+42
| |/ / /
| * | | doc: fix typoHarald Fernengel2009-06-101-1/+1
| | | |
* | | | Doc: Moved the definition of QSymbianLeaveException and fixed the brief ↵David Boddie2009-06-112-44/+48
|/ / / | | | | | | | | | | | | | | | description. Reviewed-by: Trust Me
* | | doc: document the Symbian exception helpersHarald Fernengel2009-06-102-5/+95
| | |
* | | Build fix for GCCE. I believe all auto tests for GCCE were previously failingFrans Englich2009-06-101-1/+8
| | | | | | | | | | | | | | | | | | because of this. Reviewed-by: Brad
* | | Make Qt exception safer.Robert Griebl2009-06-1072-793/+1450
| | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions, which also contains the full history. Rev-By: Harald Fernengel Rev-By: Ralf Engels
* | | Force qRound64() to take a double on platforms where qreal is a float.makuukka2009-06-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Symbian qreal is defined as float. And in qround64 the parameter was qreal. This qround64 is used (only) in qvariant::convert, when converting from double to e.g. int. This caused overflow bug for some (close to max int) values, because in convert chain double value was casted to float. Task-number: 250267 Reviewed-By: Samuel Rødal Reviewed-By: Jason Barron
* | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-06-085-5/+18
|\ \ \
| * \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-085-5/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlocalsocket/tst_qlocalsocket.cpp
| | * | | Don't use inactivatable timers to calculate time to wait for next timer.Thomas Sondergaard2009-06-041-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch prevents the eventloop from waking up needlessly. Without this patch the event loop will not sleep at all if a 0-timer is already 'inTimerEvent' Merge-request: 550 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | fix catalan plural rulesOswald Buddenhagen2009-06-032-0/+4
| | | | |
| | * | | Fix BOM for UTF-32 codecMarius Storm-Olsen2009-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BOM was created correctly, but half of the BOM was then overwritten by the converted data afterwards. Also made the autotest also do reverse encoding tests where possible. Task-number: 255095 Reviewed-by: lars
| | * | | Add a note about what happens when passing 0 to qobject_cast in the docAndy Shaw2009-06-031-1/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kavindra Palaraja
* | | | | Bug fix for 251870ikause2009-06-081-0/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A correction to this defect: 251870 QPluginLoader will only look for stubs from single drive, though plugins themselves can be located on any drive. Now the implementation goes through all the available drives if given path does not find corresponding stub-file in QPluginLoader::setFileName(). Since this is Symbian specific functionality, all the changes are behind Q_OS_SYMBIAN-flags. Note: Updated tests now need memory card being installed to device under test. Otherwise the test will be skipped. In case needed, drive is easy to change to tests. D-drive could also be a good option. modified: src/corelib/plugin/qpluginloader.cpp modified: tests/auto/qpluginloader/tst_qpluginloader.cpp Reviewed-By: Miikka Heikkinen
* | | | Cut the process priority lowering timeout to 100ms in Symbian eventdispatcher,Miikka Heikkinen2009-06-051-3/+3
| | | | | | | | | | | | | | | | as some demos were getting ViewSrv 11 panics with 500ms timeout.
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-06-0423-78/+514
|\ \ \ \
| * \ \ \ Merge branch 'imSelections'axis2009-06-0312-12/+343
| |\ \ \ \
| | * | | | Added new API Qt::ImAnchorPosition.axis2009-06-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for S60 FEP. RevBy: Simon Hausmann
| | * | | | Fixed incorrect headers.axis2009-06-0311-11/+341
| | | | | |
| * | | | | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-06-029-37/+149
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-029-37/+149
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/itemviews/puzzle/puzzle.pro examples/qtconcurrent/imagescaling/imagescaling.pro examples/widgets/movie/movie.pro tools/configure/configureapp.cpp Will rebuild configure.exe in next commit.
| | | * | | Removed nested comment signature in the doc to fix a warning.Denis Dzyubenko2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | Fixed build issues with MSVCThierry Bastian2009-05-291-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in atomic operations, we declare Interlock... functions in the namespace That can confuse the compiler because they are also declared in another header outside the namespace. Same problem in clucene where we include windows.h from within the NS. Task-number: 254214 Reviewed-by: ogoffart
| | | * | | Fixed aliasing pointer corruption in QDataStream.Trond Kjernaasen2009-05-271-15/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a union instead of an unsafe cast when swapping the bytes in the QDataStream streaming operators. The old seems to cause problems with Link Time Code Generation optimizations with the MSVC compilers. Task-number: 247708 Reviewed-by: Samuel Reviewed-by: Thiago BT: yes
| | | * | | qdoc: Indicate what iterator_categor means for container classes.Martin Smith2009-05-262-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: 245501
| | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-263-5/+12
| | | |\ \ \
| | | | * | | Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-251-2/+11
| | | | |\ \ \