summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-164-21/+44
|\
| * Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-152-12/+5
| * Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-153-10/+40
* | Improve warning for non-Item delegates.Martin Jones2010-04-161-2/+12
|/
* Correctly resolve, and load, IMG tags in Text element.Warwick Allison2010-04-153-10/+104
* Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeDataAaron Kennedy2010-04-151-2/+2
* Add flow property to Grid, adding TopToBottom mode.Martin Jones2010-04-152-43/+112
* Make sure richtext wraps correctly with a fixed height set.Martin Jones2010-04-151-1/+1
* Don't create delegates when destroying view.Martin Jones2010-04-141-1/+4
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-141-2/+2
|\
* | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-144-0/+14
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-134-0/+14
| |\
| | * Fix QT_NO_MOVIETasuku Suzuki2010-04-124-0/+14
* | | Reduce warnings at shutdownAaron Kennedy2010-04-141-1/+1
* | | Image with PreserveAspect enabled with either width or height defined should ...Joona Petrell2010-04-141-0/+6
* | | Merge branch '4.7' into reviews/2361Alexis Menard2010-04-1439-556/+1217
|\ \ \
| * | | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-149-72/+356
| * | | Doc fix.Michael Brasser2010-04-142-6/+6
| * | | emit onMovementStarted/Ended/Changed on wheel eventsMartin Jones2010-04-141-0/+4
| * | | Complete item creation after its initial properties have been initialized.Martin Jones2010-04-141-2/+2
| * | | Don't crash when columns == 0Martin Jones2010-04-141-4/+5
| * | | Ensure view position is correct for highlight range modes that have a static ...Martin Jones2010-04-132-6/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-133-4/+4
| |\ \ \
| | * | | Struct -> class because class is better.Alexis Menard2010-04-133-3/+4
| | * | | Move effect property where it should be.Alexis Menard2010-04-131-1/+0
| | |/ /
| * | | Improve efficiency of model dataChanged.Martin Jones2010-04-131-7/+8
| |/ /
| * | doc fixesYann Bodson2010-04-121-5/+15
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-121-0/+1
| |\ \
| | * | Doc: update Rectangle smooth painting screenshot.Yann Bodson2010-04-121-0/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-1229-504/+780
| |\ \ \ | | |/ /
| | * | Fix PathView crash.Michael Brasser2010-04-121-1/+1
| | * | Improve font value type documentation.Yann Bodson2010-04-123-5/+316
| | * | Remove QT_VERSION checks in QMLAaron Kennedy2010-04-092-4/+0
| | * | Small doc fix.Martin Jones2010-04-092-7/+7
| | * | Enable other wrapping modes.Martin Jones2010-04-094-15/+18
| | * | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-094-26/+56
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-094-362/+0
| | |\ \
| | | * | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-094-362/+0
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-093-19/+97
| | |\ \ \ | | | |/ /
| | | * | Make the TextInput element nicer. It has scrolling.Alexis Menard2010-04-093-19/+97
| | * | | Ensure GridView content position is stable when moving items.Martin Jones2010-04-091-0/+2
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-083-2/+7
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-083-3/+3
| | | |\ \
| | | * | | Fix AnimatedImage for remote image test. Fix and test sourceSize property.Warwick Allison2010-04-083-2/+7
| | * | | | Calculate GridView columns regardless of whether we have a populated modelMartin Jones2010-04-081-1/+1
| | * | | | Add highlightMoveDuration to views.Martin Jones2010-04-087-8/+131
| | | |/ / | | |/| |
| | * | | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-083-3/+3
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-081-2/+0
| | |\ \
| | | * | Revert "Add QListModelInterface::modelReset() signal and emit this in"Bea Lam2010-04-081-2/+0