summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-304-84/+123
|\
| * 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 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' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-2011-130/+367
|\ \ \ | |/ /
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1611-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
| | | |/ | | |/|
* | | | Doc: More work on QML reference documentation.David Boddie2010-09-172-30/+34
|/ / /
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-136-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-102-12/+14
|\ \ \ | |/ /
| * | 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
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0912-351/+521
|\ \ \ | |/ /
| * | 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
| |\
| * | Doc: More work on the QML documentation.David Boddie2010-09-072-22/+36
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-09-062-28/+30
| |\ \
| * | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-10/+19
| * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-031-0/+1
| |\ \ \
| * | | | Doc: qdoc fixes.David Boddie2010-09-021-1/+1
| * | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-014-45/+45
| * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0126-283/+31
| |\ \ \ \
| * | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-011-5/+6
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2713-75/+89
| |\ \ \ \ \
| * | | | | | Doc: More work on the QML documentation.David Boddie2010-08-273-204/+263
| * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-246-95/+85
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed incorrect use of commands to mark documentation.David Boddie2010-08-232-2/+0
| * | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-233-61/+150
* | | | | | | | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-076-178/+261
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 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
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-051-25/+23
| |\ \ \ \ \ \
| | * | | | | | Cleanup visible item checking in positionersAlan Alpert2010-09-031-25/+23
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Keep ListView position sensible when all visible items are removed.Martin Jones2010-09-031-3/+7
| |/ / / / /