summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-0445-409/+3218
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Don't accept input methods when a TextEdit or TextInput is read only.Andrew den Exter2011-02-032-0/+2
| * | | | | | Make Flickable's wheel handling more like QAbstractScrollArea.Michael Brasser2011-02-021-2/+2
| * | | | | | Changing header or footer failed to delete the previous.Martin Jones2011-02-022-0/+16
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2011-02-023-11/+48
| |\ \ \ \ \ \
| | * | | | | | update What's New for QtQuick 1.1 and AnimatedImage docsBea Lam2011-02-021-0/+9
| | * | | | | | Improve docs on Item::visible and Item::opacityBea Lam2011-02-021-10/+33
| | * | | | | | Make sure we update Loader size if item size changes after creation.Martin Jones2011-02-021-1/+6
| * | | | | | | Avoid index-out-of bounds related crash in GridAlan Alpert2011-02-021-1/+1
| |/ / / / / /
| * | | | | | PinchArea sometimes failed.Martin Jones2011-02-013-3/+6
| * | | | | | Clarify that IntValidator performs locale specific validation.Andrew den Exter2011-02-011-0/+5
| * | | | | | Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-016-71/+118
| * | | | | | Merge branch 'qtquick11' into 4.7Martin Jones2011-01-2845-393/+3092
| |\ \ \ \ \ \
| | * | | | | | Doc fix for lineHeight.Yann Bodson2011-01-281-1/+3
| | * | | | | | Add support for line spacing in Text element.Yann Bodson2011-01-283-3/+96
| | * | | | | | Fixing right-to-left text in Text and TextInputChristopher Ham2011-01-284-12/+35
| | * | | | | | Fix MaximumLineCount in Text and add testsChristopher Ham2011-01-281-24/+20
| | * | | | | | Add missing revisions for QtQuick 1.1 additionsMartin Jones2011-01-276-14/+22
| | * | | | | | Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-276-16/+15
| | |\ \ \ \ \ \
| | | * | | | | | Don't load components until the Loader component itself is completedBea Lam2011-01-272-26/+32
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-276-45/+38
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | * | | | | | | Setting the size of a loader overwrote its implict size.Martin Jones2011-01-272-4/+21
| | |/ / / / / /