summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* 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 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2615-35/+49
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-2415-33/+33
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-232-2/+16
| | |\ \ \
| | | * | | Fix left alignment of native RTL pre-edit text.Andrew den Exter2011-08-232-2/+16
| | | |/ /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-1813-31/+31
| | |\ \ \
| | | * | | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-06-3013-31/+31
* | | | | | 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 remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-152-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-082-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Fix undesirable VKB popup at task switchMiikka Heikkinen2011-08-082-2/+2
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-201-1/+1
|\ \ \ \ | |/ / /
| * | | Delay masking the last character in Password echo mode.Andrew den Exter2011-07-191-1/+1
| * | | Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-084-149/+196
| * | | Flickable is too sensitive.Martin Jones2011-07-081-1/+5
| * | | Velocities reported by Flickable in onFlickStarted can be 0Martin Jones2011-07-081-9/+21
| |/ /
* | | 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
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
* | | | | | 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.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