summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Doc: Various fixes to documentation, some based on changes in master.David Boddie2011-05-117-34/+57
* Doc: Fixed an action assignment in inline code.David Boddie2011-05-111-1/+1
* Doc: Added missing project and desktop files.David Boddie2011-05-1115-0/+235
* Doc: Added fixes left over from previous merges.David Boddie2011-05-112-1/+6
* Doc: Updated version numbers and fixed minor whitespace issues.David Boddie2011-05-116-14/+15
* 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-111355-0/+60123
* Doc: Fixed incorrect button handling.David Boddie2011-05-091-2/+2
* More examples adjusted to Symbian and Maemo5.Daniel Molkentin2011-05-052-0/+16
* Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into mer...David Boddie2011-05-05129-1727/+2433
|\
| * setPeerVerifyMode() and peerVerifyMode() comments fixTaito Silvola2011-05-051-2/+2
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-0423-141/+463
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-05-0210-126/+166
| | |\
| | | * QmlViewer: Translate UIKai Koehne2011-05-028-126/+143
| | | * Fix insert and scroll to bottom casemae2011-04-262-0/+23
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-04-141809-96541/+116105
| | |\ \ | | | |/
| | | * Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-141809-96541/+116105
| | | |\ | | |/ /
| | * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-04-132-2/+74
| | |\ \
| | | * | QDeclarativeDebug: Fix test caseKai Koehne2011-03-301-1/+1
| | | * | QDeclarativeDebug: Handle case where client with ongoing queries is deletedKai Koehne2011-03-302-1/+73
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-29129-736/+76106
| | |\ \ \ | | | |/ /
| | | * | Merge ../qt-qml-stagingYann Bodson2011-03-29129-736/+76106
| | | |\ \
| | * | \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-241-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Remove compile warningAlan Alpert2011-03-241-1/+1
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-23507-5569/+22492
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-23505-5568/+22484
| | | |\ \ \
| | | * | | | Fix QUnifiedTimer bugAlan Alpert2011-03-232-1/+8
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-166-2/+104
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Stop the animation driver when there are no more animations.Michael Brasser2011-03-162-1/+5
| | | * | | | Optimization and benchmark for setting object properties from QML.Michael Brasser2011-03-164-1/+99
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-16586-3500/+14742
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-16586-3500/+14742
| | | |\ \ \ \
| | * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-143-2/+81
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Add Constant and Final flags to QMetaObjectBuilderBea Lam2011-03-143-2/+81
| | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-03-01249-926/+5859
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-01249-926/+5859
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-02-251-1/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fixed QML TextEdit docsThiago Marcos P. Santos2011-02-251-1/+0
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-02-171096-61526/+58430
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-171096-61526/+58430
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-teamQt Continuous Integration System2011-02-082-8/+38
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Make -no-opengl exist on other platformsAlan Alpert2011-02-041-3/+2
| | | * | | | | | | Only ask for name when the user goes on the high score list.Alan Alpert2011-02-041-5/+36
| | |/ / / / / / /
| * | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-041-1/+1
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-031-1/+1
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-031-1/+1
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-031-1/+1
| * | | | | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-05-0430-133/+318
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove warningsJørgen Lind2011-05-033-1/+3
| | * | | | | | | | | | | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-035-50/+26