summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-1517-515/+637
|\
| * TextInput autoscroll now scrolls when the cursor movesAlan Alpert2010-10-141-0/+1
| * Fix alignment bugs in Text elementAaron Kennedy2010-10-132-481/+524
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-121-0/+1
| |\
| | * Bug: TextEdit ignores plain text format when pasting textYann Bodson2010-10-121-0/+1
| * | Update sections if model content changes.Martin Jones2010-10-124-3/+64
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-082-6/+9
| |\
| | * Image.sourceSize is incorrect after changing Image.sourceYann Bodson2010-10-082-6/+9
| * | Ensure GridView header is visible at the top of the view.Martin Jones2010-10-081-1/+8
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-081-2/+2
| |\
| | * Disable Text {} image caching by defaultAaron Kennedy2010-10-081-2/+2
| * | Don't forward keys to invisible items.Martin Jones2010-10-081-4/+4
| |/
| * Ensure that onRelease is called for doubleClick events.Martin Jones2010-10-082-7/+8
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-083-4/+0
| |\
| | * Remove some unnecessary includes in cpp filesAaron Kennedy2010-10-083-4/+0
| * | emit currentSectionChanged when section changes in ListView.Martin Jones2010-10-081-3/+12
| |/
| * Ensure Flickable.contentX and Flickable.contentY return correct values.Martin Jones2010-10-081-2/+2
| * Fix dragging items within a PathViewMartin Jones2010-10-071-3/+3
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-075-7/+29
|\ \ | |/
| * Doc fix.Michael Brasser2010-10-071-3/+3
| * Fix setting PathView offset when all visible items are removed.Martin Jones2010-10-071-0/+2
| * Ensure the TextInput cursor blinks immediately when enabled.Michael Brasser2010-10-061-1/+5
| * Ensure PathView updates positions when path changes.Michael Brasser2010-10-062-2/+16
| * Create Loader components in correct contextAaron Kennedy2010-10-061-1/+3
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-059-33/+478
|\ \ | |/
| * Document and test paintedWidth and paintedHeight properties of ImageYann Bodson2010-10-051-0/+9
| * Add missing license header.Michael Brasser2010-10-041-0/+41
| * Improve test coverage for declarative module.Michael Brasser2010-10-041-2/+1
| * Avoid potential null dereference.Martin Jones2010-10-042-2/+2
| * Fix clipping behavior for non-cached text.Michael Brasser2010-10-042-2/+1
| * CompileAaron Kennedy2010-10-042-0/+55
| * Only cache textlayout in paint engines that support transformationsAaron Kennedy2010-10-011-1/+6
| * Apply the QStaticText text-caching strategy for QMLAaron Kennedy2010-10-015-28/+365
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-047-64/+213
|\ \ | |/
| * Use setParentItem() instead of setParentItemHelper if componentComplete is trueMarco Bubke2010-09-302-9/+34
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-293-30/+104
| |\
| | * Correct property type of PathAttribute::value in the docs.Michael Brasser2010-09-291-1/+1
| | * Fix crash when trying to append a null transform to QDeclarativeItem.Michael Brasser2010-09-281-1/+1
| | * Documentation.Michael Brasser2010-09-282-24/+98
| | * Documentation fix for Flickable (mark content properties as real, not int).Michael Brasser2010-09-281-4/+4
| * | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-294-7/+7
| * | Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-20/+78
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-282-6/+6
|\ \ | |/
| * Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| * Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-211-3/+3
| * Small optimization for QDeclarativeVisualDataModel.Michael Brasser2010-09-211-2/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2114-221/+465
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-172-78/+117
| |\
| | * PathView didn't accept mouse events, preventing it from working in a Flickable.Martin Jones2010-09-172-75/+112
| | * Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-171-3/+5