summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/msculls-modelview-qdoc-enhanc...Roland Wolf2010-09-0240-858/+541
|\
| * fixed compilation problemRoland Wolf2010-07-302-7/+13
| * Merge branch 'modelviewdoc' of scm.dev.nokia.troll.no:qt/msculls-modelview-qd...Roland Wolf2010-07-301-3/+3
| |\
| | * problem: 2 images that were in raw html tables appeared smaller in konqueror ...Michael D Scull2010-07-291-3/+3
| * | added missing filesRoland Wolf2010-07-304-0/+318
| * | added missing filesRoland Wolf2010-07-302-0/+119
| |/
| * moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8Roland Wolf2010-07-2940-1245/+485
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-271-5/+5
|\ \
| * | Updated some URLs and required tools versions for SymbianMiikka Heikkinen2010-08-271-5/+5
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2737-534/+139
|\ \ \ | |/ / |/| |
| * | CleanupAaron Kennedy2010-08-273-13/+11
| * | Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-272-38/+0
| * | Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-2728-375/+4
| * | Internal QML API cleanupAaron Kennedy2010-08-275-108/+124
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2745-63/+213
|\ \
| * | Update example screenshot in doc.Yann Bodson2010-08-271-0/+0
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2010-08-2614-29/+85
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-2644-63/+213
| |\ \ \
| | * | | Handle layoutChanged() properly in QML views.Martin Jones2010-08-263-1/+10
| | * | | Fix ListView and GridView tests following off-by-one fixes.Martin Jones2010-08-262-3/+3
| | * | | Revert 4bc81bb1cb3cd4a0a3fe071e00556124e770d7acMartin Jones2010-08-261-2/+0
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-2629-30/+102
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2611-20/+92
| | | |\ \ \
| | | | * | | Add quit buttons to declarative demosJoona Petrell2010-08-2611-20/+92
| | | * | | | Make declarative examples a bit more qt-like.Yann Bodson2010-08-2619-10/+10
| | | |/ / /
| | * | | | Fix off-by-one at end when views scroll to keep currentItem visible.Martin Jones2010-08-262-13/+13
| | |/ / /
| | * | | ListView.view and GridView.view properties should not be writable.Martin Jones2010-08-262-2/+2
| | * | | Avoid Flickable view jumping when drag threashold is exceeded.Martin Jones2010-08-262-2/+9
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-261-2/+0
| | |\ \ \
| | | * | | Remove dead code.Michael Brasser2010-08-261-2/+0
| | * | | | Fix ListView.view attached property with VisualItemModelMartin Jones2010-08-266-9/+26
| | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-251-3/+0
| | |\ \ \
| | | * | | Remove unused code.Michael Brasser2010-08-251-3/+0
| | * | | | Add test for VisualItemModel layoutChanged() handlingMartin Jones2010-08-252-0/+50
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-254-5/+66
| | |\ \ \ \ | | | |/ / /
| | * | | | Handle QAbstractItemModel layoutChanged() signalMartin Jones2010-08-251-0/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2669-216/+4403
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Autotest: don't use Q_FUNC_INFO for testing which method got calledThiago Macieira2010-08-261-15/+20
| * | | | | fix generated makefile dependenciesOswald Buddenhagen2010-08-261-2/+2
| * | | | | Cocoa: Demo browser can get stuck after closing modal dialogRichard Moe Gustavsen2010-08-261-0/+6
| * | | | | Restore default if to system default on session close.Aaron McCarthy2010-08-262-16/+32
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2565-183/+4343
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | tst_qmake doesn't need QtGuiThiago Macieira2010-08-251-0/+1
| | * | | | Use the full path to qmake in the qmake unit testThiago Macieira2010-08-251-1/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2564-182/+4340
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-255-13/+27
| | | |\ \ \
| | | | * | | Fixed item view background color in Gtk styleJens Bache-Wiig2010-08-252-4/+21
| | | | * | | scope fixes and clutter reduction for sql driver projectsMark Brand2010-08-252-7/+4
| | | | * | | I don't know why some linkers can't call this function, so comment it out.Thiago Macieira2010-08-251-2/+2
| | | * | | | qdoc: Fixed erroneous links to QML basic types.Martin Smith2010-08-251-2/+9
| | | |/ / /