summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-212-11/+27
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2011-75/+75
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-204-39/+75
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-151-0/+1
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1416-515/+636
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-085-7/+29
| | |\ \ \ \ \ \ \
| | * | | | | | | | Doc: Fixed qdoc warnings.David Boddie2010-10-071-1/+1
* | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2516-154/+211
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix Flipable docsBea Lam2010-10-221-13/+14
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove unnecessary roundingAlan Alpert2010-10-211-2/+0
| * | | | | | | Flickable 'moving' parameter stays at true when setting contentY.Martin Jones2010-10-212-9/+27
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Ensure we don't refill the view before all model changes are complete.Martin Jones2010-10-202-21/+27
| * | | | | | ListView item insertion didn't handle delayed item removal correctly.Martin Jones2010-10-201-30/+4
| * | | | | | Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-195-10/+17
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-194-14/+27
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix QDeclarativeTextLayout under non-affine transformationAaron Kennedy2010-10-181-1/+1
| | * | | | | ListView.visibleArea.heightRatio should not emit a signal when it does not ch...Yann Bodson2010-10-183-13/+26
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-183-37/+73
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-152-30/+34
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-142-30/+34
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-132-30/+34
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-075-7/+29
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | * | | | | | | | Actually call update in the Text ElementAlan Alpert2010-10-151-0/+1
| | * | | | | | | | Recalculate Text Element's alignment when width changesAlan Alpert2010-10-151-3/+4
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-143-481/+525
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | * | | | | | | | Fix consistency of setting currentIndex in ListView and GridView.Martin Jones2010-10-142-34/+68
| * | | | | | | | | Corrected spelling mistake and whitespace fixes.Jerome Pasion2010-10-181-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-141-0/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-1316-515/+636
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-075-7/+29
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-059-33/+478
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-047-66/+223
| |\ \ \ \ \ \