summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2011.Rohan McGovern2011-03-103-3/+3
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-092-0/+2
|\
| * Set correct initial value for TextEdit and TextInput canPaste propertyYann Bodson2011-03-072-0/+2
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-12/+15
|\ \ | |/
| * Fix word selection locking on string boundaries.Andrew den Exter2011-03-041-11/+14
| * Compensate for horizontal scroll in TextInput micro focus.Andrew den Exter2011-03-031-1/+1
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-035-19/+101
|\ \ | |/
| * Make the TextInput cursorRectangle relative to the item.Andrew den Exter2011-03-021-0/+1
| * Don't assert if font engine creates new glyphsAaron Kennedy2011-03-021-5/+6
| * Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-013-6/+31
| * Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-014-8/+63
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0110-54/+159
|\ \ | |/
| * Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-284-43/+84
| * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-288-7/+34
| * Document BorderImage::asynchronousAlan Alpert2011-02-271-0/+14
| * Ensure layout is updated when section property changes.Martin Jones2011-02-251-1/+4
| * Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-242-3/+23
* | 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
| | |/