summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* 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-291-1/+1
| | * Documentation.Michael Brasser2010-09-292-24/+98
| | * Documentation fix for Flickable (mark content properties as real, not int).Michael Brasser2010-09-291-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
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1711-130/+367
| |\|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-167-117/+215
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-159-31/+45
| | | |\
| | | * | Doc: Further QML improvements.David Boddie2010-09-151-22/+61
| | | * | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-151-2/+2
| | | * | Doc: Continued work on the QML documentation.David Boddie2010-09-141-10/+49
| | | * | Doc: More work on the QML documentation.David Boddie2010-09-141-57/+59
| | | * | Doc: More work on the declarative API documentation.David Boddie2010-09-135-26/+44
| | * | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-161-10/+30
| | * | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-6/+8
| | * | | Completing the interface for children/data/resourcesThomas Hartmann2010-09-144-3/+120
| | | |/ | | |/|
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-146-10/+24
| |\| |
| | * | When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-132-7/+16
| | * | Ensure flickable velocity is updated when view is moved by setCurrentIndexMartin Jones2010-09-134-3/+8
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-112-12/+14
| |\| |
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1012-351/+521
| |\ \ \
| * \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-076-178/+261
| |\ \ \ \
| * \ \ \ \ Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-031-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-022-3/+13
| |\ \ \ \ \ \
| | * | | | | | Clarified iterator semantic in documentation and added a code snippet to a QM...Jerome Pasion2010-08-311-0/+10
| | * | | | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-3/+3
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1019-551/+825
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Autotest for QTBUG-13454.Yann Bodson2010-09-101-2/+1
| * | | | | | | Changing the Image 'source' should not go through the 'Loading' state if the ...Yann Bodson2010-09-101-10/+13
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Don't cause repaints during painting in Text elementMartin Jones2010-09-081-9/+7
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-075-150/+231
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | ListView: Ensure highlight is positioned correctly in positionViewAtIndex().Martin Jones2010-09-071-15/+56
| | * | | | Fix PathView item position on insertion and removal.Martin Jones2010-09-063-128/+170
| | * | | | Do not reset sourceSize when changing image source url.Yann Bodson2010-09-061-3/+0
| | * | | | Ensure all image state is updated before emitting changed signals.Martin Jones2010-09-061-5/+6
| * | | | | Doc: More work on the QML documentation.David Boddie2010-09-072-22/+36
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-062-28/+30
| |\| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-061-25/+23
| | |\ \ \ \