summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0925-68/+546
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0925-68/+546
| |\
| | * Update QtGui bwins def file for QTBUG-15615Joona Petrell2010-12-091-2/+4
| | * Merge qtsoftware:qt/qt.git#4.7 into qtsoftware:qt/qt-qml.git#4.7Joona Petrell2010-12-0921-77/+308
| | |\
| | * | highlightFollowsCurrentItem: false was not always honoredMartin Jones2010-12-096-20/+44
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0821-46/+498
| | |\ \
| | | * | ListView: Fix calculation of currentItem position when out of view.Martin Jones2010-12-083-5/+102
| | | * | Update QtGui def filesJoona Petrell2010-12-072-0/+2
| | | * | Fix openDatabaseSync() to not create unused directoryBea Lam2010-12-071-1/+0
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0615-40/+394
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-0615-40/+394
| | | | |\ \
| | | | | * | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-064-1/+156
| | | | | * | Some doc clarification for components and javascript integrationBea Lam2010-12-062-15/+18
| | | | | * | Cursor shouldn't blink while dragging cursor positionChristopher Ham2010-12-063-0/+11
| | | | | * | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-066-22/+207
| | | | | * | Doc: make it clear that "z" affects sibling stacking order.Martin Jones2010-12-051-2/+2
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-12-096-149/+191
|\ \ \ \ \ \ \
| * | | | | | | Runtime dependency on Symbians Font Table APIAlessandro Portale2010-12-093-147/+181
| * | | | | | | Add libinfix support for QML plugins in Symbian.Miikka Heikkinen2010-12-093-2/+10
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-12-098-9/+59
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-081-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Remove whitespace and leading tab from documentation changeSami Merila2010-12-081-1/+1
| | * | | | | | | Merge commit 'refs/merge-requests/2509' of gitorious.org:qt/qt into integrationSami Merila2010-12-081-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Adding warning to QMenu documentationKarim Pinter2010-11-261-0/+3
| * | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-074-4/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge commit 'refs/merge-requests/2512' of gitorious.org:qt/qt into integrationSami Merila2010-12-071-0/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Updating merge request 2512Karim Pinter2010-12-071-3/+1
| | | * | | | | | | | Removes the reseting of the QMenu offset.Karim Pinter2010-11-291-0/+4
| | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-063-4/+18
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-05118-2683/+4717
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-03108-2594/+4587
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cacheJohn Tapsell2010-12-032-2/+7
| | * | | | | | | | | Fix integer overflow in bitfieldJan-Arve Sæther2010-12-031-1/+1
| | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-027-86/+122
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2010-12-0215-79/+209
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-0115-79/+209
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-12-0160-341/+1663
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-3060-341/+1663
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-295-13/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-295-13/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-291-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Fix documentation for QML extended typesCaio Marcelo de Oliveira Filho2010-11-291-2/+2
| * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-282-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-282-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-2730-229/+325
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2730-229/+325
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-2628-217/+978
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-2628-217/+978
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Qt Continuous Integration System2010-11-25196-1442/+17573
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-25143-1340/+6082
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \