summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt-mainline/4.8'aavit2011-06-2293-564/+1161
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-2110-22/+87
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-214-13/+44
| |\ \
| | * | QDeclarativeDebug: Fix cases where multiple packets arrive in one goKai Koehne2011-06-202-13/+27
| | * | Rewrite autotests for js debuggingAurindam Jana2011-06-141-0/+11
| | * | Create property cache in case of Component{} rootAaron Kennedy2011-06-101-0/+6
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-06-2071-342/+761
| |\ \ \
| | * \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-17323-6340/+9312
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-06-169-138/+257
| | | |\ \ \
| | * | | | | Undo accidental breakage.David Boddie2011-05-252-3/+3
| | * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-244271-78546/+74507
| | |\ \ \ \ \
| | * | | | | | Fixed breakage caused by b727e5b95c1f0bd308b228fcf0445b42847ae583.David Boddie2011-05-241-13/+0
| | * | | | | | Doc: Added some details to the accessibility events API documentation.David Boddie2011-05-191-36/+95
| | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-16201-630/+10161
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-128-44/+82
| | * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-7/+10
| | * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-8/+8
| | * | | | | | | Doc: Applying a pending change from previous merges.David Boddie2011-05-111-0/+4
| | * | | | | | | Doc: Fixed qdoc warning.David Boddie2011-05-111-1/+1
| | * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-05-1137-170/+259
| | * | | | | | | Doc: Applied pending fixes to API documentation.David Boddie2011-05-1119-68/+90
| | * | | | | | | Doc: Documented the value returned when no field can be found.David Boddie2011-05-111-1/+2
| | * | | | | | | Squashed commit of changes from the 4.8-temp branch.David Boddie2011-05-114-0/+205
| | * | | | | | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into mer...David Boddie2011-05-0586-1401/+982
| | |\ \ \ \ \ \ \
| | | * | | | | | | setPeerVerifyMode() and peerVerifyMode() comments fixTaito Silvola2011-05-051-2/+2
| | * | | | | | | | Doc: Fixed incorrect inline snippet for an example .sci file.David Boddie2011-05-041-12/+10
| | * | | | | | | | Doc: Clarified and tidied up OpenGL overlay color documentation.David Boddie2011-05-041-9/+4
| | * | | | | | | | Doc: Added a code snippet to clarify the use of a function.David Boddie2011-05-041-0/+5
| | * | | | | | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-045-5/+18
| * | | | | | | | | Fix build break in S60 5.0 environmentMiikka Heikkinen2011-06-201-3/+0
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-06-201-5/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Skip softkeys update if application is not on foreground in SymbianMiikka Heikkinen2011-06-171-0/+5
| | * | | | | | | | | Revert "Opening taskswitcher, pushes application softkeys to top of switcher"Miikka Heikkinen2011-06-171-5/+3
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-06-178-137/+248
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | DEF file updates for Symbianmread2011-06-158-137/+248
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamSami Lempinen2011-06-151-1/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | QTBUG-19883 Adding top level TRAP for QThreads on Symbianmread2011-06-151-1/+9
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-151-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"Shane Kearns2011-06-142-10/+4
| | * | | | | | | | QFileInfoGatherer: call QFileSystemWatcher addPaths from proper threadShane Kearns2011-06-132-4/+10
| | * | | | | | | | Symbian QFileSystemWatcher: fix potential crashShane Kearns2011-06-131-2/+2
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-06-144-32/+31
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/4.8'Thierry Bastian2011-05-264255-73896/+73695
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | When asking for relations, don't crash on children that don't return an inter...Frederik Gladhorn2011-05-191-4/+7
| | * | | | | | | | | | Merge branch '4.8-upstream'Thierry Bastian2011-05-19403-7360/+13826
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove more inconsistencies with invisible.Frederik Gladhorn2011-05-191-18/+0
| | * | | | | | | | | | | Fix a problem where the video would'nt show on some containersThierry Bastian2011-05-161-8/+22
| | * | | | | | | | | | | QAccessibleToolButton::text should return accessibleName if set.Frederik Gladhorn2011-05-051-1/+1
| | * | | | | | | | | | | Remove stray semicolon.Frederik Gladhorn2011-05-051-1/+1
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-1413-97/+221
| |\ \ \ \ \ \ \ \ \ \ \ \