summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-195-55/+102
|\
| * Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747Martin Jones2010-11-162-0/+3
| * VisualDataModel::count should be 0 until a valid delegate is set.Martin Jones2010-11-161-0/+2
| * Doc: Remove default from PathView path propertyMartin Jones2010-11-161-1/+0
| * ListView: items with size < 1.0 were layed out incorrectly.Martin Jones2010-11-151-3/+3
| * ListView.SnapToItem with ListView.StrictlyEnforceRange is broken.Martin Jones2010-11-151-34/+20
| * Fix PathView key navigation docs.Martin Jones2010-11-121-1/+15
| * Ensure increment/decrementCurrentIndex always move items in the correct direc...Martin Jones2010-11-122-10/+24
| * Ensure loaded item's parent is set before component completion.Martin Jones2010-11-121-6/+35
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1212-94/+179
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-111-0/+14
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-103-18/+28
| | |\
| | * | Flickable does not reposition its content when it is resized.Martin Jones2010-11-101-0/+14
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-101-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-081-2/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-051-2/+2
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-011-2/+2
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-291-2/+2
| | | | | |\ \
| | | | | | * | Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-291-2/+2
| * | | | | | | Document TextInput::select(start,end)Michael Brasser2010-11-091-6/+17
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0911-75/+136
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix Text::elide docs.Bea Lam2010-11-091-1/+1
| | | |_|_|_|/ | | |/| | | |
| | * | | | | Fix Rectangle painting at small sizes.Martin Jones2010-11-091-1/+2
| | * | | | | Text alignment is broken with multi-line text and implicit size.Yann Bodson2010-11-081-12/+46
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-0510-76/+102
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Image bounding rect should always include the area being paintedJoona Petrell2010-11-052-3/+25
| | | * | | | Fix errors in example code. Also reverts the example code to the oldBea Lam2010-11-042-14/+18
| | | * | | | Fix regression in 648eb76c and update visual tests.Martin Jones2010-11-041-0/+1
| | | * | | | Don't emit xChanged()/yChanged() twice.Martin Jones2010-11-041-4/+0
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-11-033-12/+27
| | | |\ \ \ \
| | | | * | | | Regression: QDeclarativeText does not update when text turns emptyYann Bodson2010-11-033-0/+15
| | | | * | | | Regression: Text element breaks when using \n for separating linesYann Bodson2010-11-021-12/+12
| | | | |/ / /
| | | * | | | Combining ListView.StrictlyEnforceRange and resizing currentItem stalls.Martin Jones2010-11-033-43/+31
| | | |/ / /
| * | | | | Doc: Attempt to document content handling in Flickable.David Boddie2010-11-041-11/+10
| |/ / / /
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Doc: Mentioned default values for the BorderImage tile modes.David Boddie2010-11-031-0/+2
| |/ / /
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-011-1/+2
|\ \ \ \ | |/ / /
| * | | Quickly clicking an item that doesn't use double clicking should result in tw...Joona Petrell2010-11-011-1/+2
| |/ /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-291-45/+11
|\ \ \ | |/ /
| * | Regression: horizontal alignment bug with single line textYann Bodson2010-10-291-3/+3
| * | Update when text changes to ""Alan Alpert2010-10-291-1/+2
| * | Remove unnecessary layouting code from QDeclarativeTextYann Bodson2010-10-281-43/+8
| |/
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-271-1/+2
|\ \ | |/
| * Doc clarification for Loader.Michael Brasser2010-10-271-1/+2
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-267-29/+29
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-267-29/+29
| |\
| | * Run util/normalize on src/declarative.Yann Bodson2010-10-267-29/+29
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-251-1/+1
| |\ \ | | |/ | |/|
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-221-13/+14
| | |\