summaryrefslogtreecommitdiff
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-251-3/+3
|\
| * Fixes for the manifest and links.Casper van Donderen2011-11-241-3/+3
* | Fix alignment of non-wrapped richtext QML Text elements.Miikka Heikkinen2011-11-161-1/+1
|/
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-312-0/+25
|\
| * Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-252-16/+31
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-122-15/+10
| |\
| | * Cannot flick to the end of a horizontal list view width LayoutMirroringMartin Jones2011-10-122-15/+10
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-122-1/+21
| |\ \ | | |/
| | * Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2Martin Jones2011-09-142-1/+21
* | | Converting accidental use of doubles to qreal in declarativemread2011-10-054-22/+22
* | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1416-112/+128
|\ \ \ | |/ / |/| |
| * | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-082-2/+4
| |\ \
| * \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-032-4/+8
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-313-4/+5
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-301-2/+2
| | |\ \ \ \
| | | * | | | QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-301-2/+2
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-291-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix conversion of QAbstractItemModel::rowsMoved() parametersBea Lam2011-08-291-1/+1
| | * | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-2715-35/+49
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-261-1/+2
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Correct documentation of TextInput.PasswordEchoOnEdit.Andrew den Exter2011-08-221-1/+2
| * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-3115-33/+33
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2615-35/+49
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-152-2/+2
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Documentation fix.Casper van Donderen2011-07-141-10/+6
| * | | | | | | | Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-086-166/+232
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-07-054-159/+222
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-044-149/+196
| | | * | | | | | | | Flickable is too sensitive.Martin Jones2011-06-291-1/+5
| | | * | | | | | | | Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-06-281-9/+21
| | * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-012-7/+10
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-07-0113-31/+31
| |/ / / / / / / / / /
| * | | | | | | | | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7Jani Hautakangas2011-06-221-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-104-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 remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3114-108/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-242-36/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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-143-4/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-063-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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /