summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-012-7/+10
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-292-7/+10
| |\
| | * Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-292-7/+10
* | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-221-2/+2
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-211-2/+2
| |\ \
| | * | Scroll correctly when cursorPosition is changed within onTextChanged.Andrew den Exter2011-06-201-2/+2
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1720-183/+96
|\ \ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-06-094-3/+35
| |\ \ \ \
| | * | | | Fix docs on caching for images loaded by image providersBea Lam2011-06-021-0/+26
| | * | | | ListView segmentation fault when setting highlight to nullMartin Jones2011-05-303-3/+9
| * | | | | Merge branch '4.7' into qt-4.8-from-4.7Liang Qi2011-06-063-36/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-043-36/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Revert some of "Make QMLViewer startup animation stop after a while"Alan Alpert2011-06-033-36/+0
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3114-108/+38
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-2714-108/+38
| | |\ \ \ \ | | | |/ / /
| | | * | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-2714-108/+38
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-251-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-251-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | Flickable could flick in wrong direction if given too few touch samplesMartin Jones2011-05-251-1/+1
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-242-36/+23
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-202-36/+23
| | |\ \ | | | |/
| | | * Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-05-202-36/+23
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-1787-1480/+1480
| | |\ \ | | | |/ | | |/|
| | | * Update licenseheader text in source filesJyri Tahtela2011-05-1387-1480/+1480
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-2487-1484/+1525
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-185-4/+45
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-133-4/+36
| | |\ \ \ | | | |/ /
| | | * | QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-132-0/+29
| | | * | ListViews loses items if all visible items are removed.Martin Jones2011-05-131-4/+7
| | * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-063-0/+9
| | |\ \ \ | | | |/ /
| | | * | Views do not notify count changes properlyMartin Jones2011-05-053-0/+9
| | | |/
| * | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1387-1480/+1480
| |/ /
* | | Doc: Fixed qdoc warnings.David Boddie2011-05-112-4/+40
* | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into mer...David Boddie2011-05-051-1/+0
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-041-1/+0
| |\ \
| | * \ Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-1419-232/+413
| | |\ \
| | * \ \ Merge ../qt-qml-stagingYann Bodson2011-03-296-39/+59
| | |\ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtAlan Alpert2011-03-237-17/+28
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of ../qt-qml-stagingYann Bodson2011-03-1630-582/+2045
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-stagingMartin Jones2011-03-0114-44/+210
| | |\ \ \ \ \ \
| | * | | | | | | Fixed QML TextEdit docsThiago Marcos P. Santos2011-02-251-1/+0
* | | | | | | | | Doc: Fixed incorrect inline snippet for an example .sci file.David Boddie2011-05-041-12/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-291-0/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-281-0/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Clear the root index when the model is reset.Girish Ramakrishnan2011-04-271-0/+5
| | * | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-279-24/+36
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-2814-37/+185
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-275-8/+32
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-273-4/+13
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-272-4/+11
generated by cgit v0.12 at 2025-01-23 00:18:58 (GMT)