summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-231-8/+29
|\
| * DelayRemove of list delegate on section boundary duplicated sectionMartin Jones2011-02-231-8/+29
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-2314-35/+164
|\ \ | |/
| * ListView and GridView indexAt should use qreal coordinates.Martin Jones2011-02-234-6/+6
| * Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-2212-92/+157
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-185-3/+46
| | |\
| * | | Prevent recursion due to nested Flickables with pressDelayMartin Jones2011-02-213-4/+46
| * | | Hide the TextInput/Edit cursor when the view doesn't have focus.Andrew den Exter2011-02-212-2/+2
| * | | Forward mouse events from TextInput and TextEdit to QInputContext.Andrew den Exter2011-02-213-20/+64
| | |/ | |/|
| * | Allow MouseArea to prevent mouse grab begin stolen by Flickable.Martin Jones2011-02-174-3/+44
| * | Update the input context when the pre-edit cursor position changes.Andrew den Exter2011-02-161-0/+2
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-173-1/+17
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-151-0/+9
| |\ \ | | |/
| | * Use QML notation for documenting TextInput::accepted() signal.Andrew den Exter2011-02-151-4/+4
| | * Document the TextInput accepted() signal.Andrew den Exter2011-02-151-0/+9
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-142-1/+8
| |\ \ | | |/
| | * Flickable uses the flick velocity to determine whether to retain grabMartin Jones2011-02-111-1/+6
| | * MouseArea docs - link to onCanceled() from onReleased()Bea Lam2011-02-111-0/+2
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-105-16/+48
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-105-16/+48
| |\ \ | | |/
| | * PathView items were not correctly updated when rootIndex changed.Martin Jones2011-02-101-16/+28
| | * Allow text to selected in a TextEdit or TextInput inside a Flickable.Andrew den Exter2011-02-104-0/+20
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-1017-157/+243
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-095-57/+44
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2011-02-096-12/+31
| | |\
| | | * PathView regression: dragging the path didn't update currentIndexMartin Jones2011-02-091-1/+1
| | | * Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m...Yann Bodson2011-02-092-6/+8
| | * | Call onAdd() for first items added to ListView and GridViewBea Lam2011-02-092-50/+35
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-081-1/+11
| |\ \ \ | | | |/ | | |/|
| | * | Scroll TextInput to ensure preedit text is visible.Andrew den Exter2011-02-081-1/+11
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-075-8/+32
| |\ \ \ | | |/ /
| | * | Changing header/footer size during creation caused recusionMartin Jones2011-02-072-4/+8
| | * | Ensure section delegates are updated when the section property changes.Martin Jones2011-02-071-0/+3
| | |/
| | * modelChanged() should not be emitted until view is repopulatedBea Lam2011-02-041-1/+1
| | * AnimatedImage does not notify on status change.Yann Bodson2011-02-042-3/+20
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-0412-92/+157
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-2612-67/+97
| | |\
| | * | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-245-33/+65
| | * | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-2180-164/+199
| | |\ \
| | | * | Doc: Fixed QML syntax.David Boddie2011-01-192-15/+23
| | | * | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-173-11/+18
| | | * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1380-146/+175
| | | |\ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-202-0/+4
| | | |\ \ \
| | * | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-211-7/+7
| | * | | | | Doc: Fixed invalid QML snippets and marked up JavaScript correctly.David Boddie2011-01-201-33/+64
| | |/ / / /
| | * | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-158-24/+51
| | |\ \ \ \
| | * | | | | Doc: Fixed an old-style float.David Boddie2010-12-151-1/+3
| | * | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-144-8/+24
| | * | | | | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-134-27/+9
* | | | | | | Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-091-23/+0