summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-0115-68/+111
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-011-17/+40
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-301-17/+40
| | |\
| | | * Fix bold text rendering of Thai and Vietnamese on SymbianAlessandro Portale2010-04-301-17/+40
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-014-13/+32
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-304-13/+32
| | |\ \ | |/ / /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-304-13/+32
| | |\ \
| | | * | Fixed a leak in QTextDocument::print().Trond Kjernåsen2010-04-292-8/+5
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-292-5/+27
| | | |\ \
| | | | * | Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.Jan-Arve Sæther2010-04-292-5/+27
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-303-3/+25
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-303-3/+25
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix crash in QDBusInterface when invoking a method in a derived class.Thiago Macieira2010-04-292-1/+23
| | | * | | | tst_selftest: Fix off-by-one error in cleaning up line numbers and filenamesThiago Macieira2010-04-291-2/+2
| | | |/ / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-303-38/+96
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Event dispatcher slow down using delays rather than thread prioritymread2010-04-302-37/+95
| | * | | Fixed incorrect runtime platform version check in Phonon MMF backendGareth Stockwell2010-04-301-1/+1
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-307-126/+47
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Removing unused code.Alessandro Portale2010-04-302-27/+2
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-295-99/+45
| | |\ \ | |/ / /
| | * | Support 'Text' mode in Symbian specific input methodsSami Merila2010-04-291-1/+1
| | * | Map Symbian touch points to the screen's coordinate system.Jason Barron2010-04-291-1/+1
| | * | Revert "Event dispatcher slow down using delays rather than thread priority"Miikka Heikkinen2010-04-292-95/+37
| | * | Fix long menu item texts causing crashMiikka Heikkinen2010-04-291-2/+6
* | | | Fix the include header <qstring.h> -> <QtCore/qstring.h>Thiago Macieira2010-05-011-1/+1
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-30379-150565/+248828
|\ \ \ \
| * | | | Testlib XML flush: use benchmarkMetricName (identifier) overall instead of be...Thiago Macieira2010-04-291-1/+1
| * | | | Update the testlib XML baselines with the unit names from QTestLibThiago Macieira2010-04-296-24/+24
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-29131-709/+1025
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-281-11/+84
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-281-11/+84
| | | |\ \ \
| | | | * | | tst_selftest: parse benchlib results in XML format tooThiago Macieira2010-04-281-1/+67
| | | | * | | tst_selftests: replace a line number with __LINE__ in XML tooThiago Macieira2010-04-281-10/+17
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-284-46/+46
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Renaming a few unexported, private symbolsAlessandro Portale2010-04-284-46/+46
| | |/ / /
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-282-18/+0
| | |\ \ \
| | | * | | Removed fullscreen responsiveness of softkeysMiikka Heikkinen2010-04-282-18/+0
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-2894-187/+187
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | tst_selftest: use @INSERT_QT_VERSION_HERE@ to indicate the Qt version.Thiago Macieira2010-04-2894-187/+187
| | |/ / /
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-274-4/+16
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-274-4/+16
| | | |\ \ \
| | | | * | | fix crash in QXmlStreamReaderPeter Hartmann2010-04-274-4/+16
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-271-32/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-271-32/+1
| | | |\ \ \ | | |/ / / /
| | | * | | The cmd line arguments have not been delegated properly.Aleksandar Sasha Babic2010-04-271-32/+1
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-271-3/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fixed a QFontEngine leak for QFont objects used in threads.Trond Kjernåsen2010-04-271-3/+2
| | |/ / /
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-271-2/+10
| | |\ \ \
| | | * | | Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' value.Trond Kjernåsen2010-04-271-2/+10
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-271-235/+282
| | |\ \ \ \ | | | |_|_|/ | | |/| | |