summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-275-8/+32
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-273-4/+13
| |\
| | * Ignore changes to selectByMouse during a selection.Andrew den Exter2011-04-272-4/+11
| | * PathView offset out of sync with currentIndex when items are removed.Martin Jones2011-04-271-0/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-1/+5
| |\ \ | | |/
| | * Move the TextInput cursor delegate when the preedit position changes.Andrew den Exter2011-04-271-1/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-262-3/+14
| |\ \
| | * | Support text decoration in QML when using static text back-endEskil Abrahamsen Blomfeldt2011-04-181-0/+10
| | * | Fix missing color in text when using static text back-end in QMLEskil Abrahamsen Blomfeldt2011-04-182-3/+4
* | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-226-17/+64
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-216-17/+64
| |\ \ \ | | | |/ | | |/|
| | * | Document section behavior when not ordered by sectionMartin Jones2011-04-211-0/+8
| | * | Fix TextInput echoMode clearing inputMethodHints set by the user.Andrew den Exter2011-04-213-12/+37
| | * | Elide has unexpected effect on Text's implicitWidthMartin Jones2011-04-212-5/+19
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-213-0/+36
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-203-0/+36
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-193-0/+36
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-203-12/+53
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-183-12/+53
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-1/+1
| | |\ \ | | | |/
| | | * Fix uninitialized variable.Martin Jones2011-04-141-1/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-142-0/+42
| | |\ \ | | | |/
| | | * Moving contentY by large values in List/GridView is slowMartin Jones2011-04-142-0/+42
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-131-9/+6
| | |\ \ | | | |/
| | | * Fix TextEdit cursorRectangle property.Andrew den Exter2011-04-131-9/+6
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-2/+4
| | |\ \ | | | |/
| | | * ListView has wrong keyPressEvent behaviour when verticalMartin Jones2011-04-121-2/+2
| | | * Ensure view is positioned correctly when orientation changes.Martin Jones2011-04-121-0/+2
* | | | Fix warning about vSize not being used in this functionThiago Macieira2011-04-171-1/+1
|/ / /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-082-10/+22
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-072-10/+22
| |\ \ | | |/
| | * Image w/ PreserveAspectFit has its width changed once more than needed.Martin Jones2011-04-072-10/+22
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-074-81/+186
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-064-81/+186
| |\ \ | | |/
| | * Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-064-81/+186
* | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-051-3/+0
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-0110-116/+182
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-0110-116/+182
| |\ \ | | |/
| | * Changing width of RTL positioner doesn't relayoutMartin Jones2011-04-011-0/+10
| | * PinchArea and Flickable don't work well enough togetherMartin Jones2011-03-314-111/+146
| | * Once Image sourceSize is set there is no way to clear it.Martin Jones2011-03-313-1/+17
| | * Canceling image download while reading causes crashMartin Jones2011-03-302-2/+5
| | * Fix width of TextInput micro focus rectangle.Andrew den Exter2011-03-301-2/+4
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-317-22/+23
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-301-1/+1
| |\ \ | | |/
| | * GridView jumps to beginning of list when resizedMartin Jones2011-03-291-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-277-21/+22
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2230-530/+1831
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-0912-80/+272
| | |\ \
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-011-1/+1