summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-169-26/+72
|\
| * CleanupAaron Kennedy2010-04-162-3/+3
| * Class documentation fixes for declarative.Michael Brasser2010-04-165-18/+62
| * Correctly support translation in QDeclarativePixmapCacheWarwick Allison2010-04-162-5/+7
* | Avoid calling QGraphicsItem::setTransformOriginPoint() until neededMartin Jones2010-04-162-5/+25
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1622-180/+316
|\
| * Correctly support translation in QDeclarativeCompilerAaron Kennedy2010-04-152-8/+2
| * Support valuetypes as method return valuesAaron Kennedy2010-04-155-40/+99
| * Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
| |\
| | * DocAaron Kennedy2010-04-151-0/+20
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1512-99/+126
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-153-10/+104
| | |\
| | * | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1511-94/+119
| | * | CommentsAaron Kennedy2010-04-151-1/+3
| | * | Remove unused parameterAaron Kennedy2010-04-153-4/+4
| * | | 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-155-22/+65
| | |/ | |/|
* | | 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-1521-80/+80
* Rename QDeclarativeData -> QAbstractDeclarativeDataAaron Kennedy2010-04-152-7/+7
* Add flow property to Grid, adding TopToBottom mode.Martin Jones2010-04-152-43/+112
* Add QML object destruction hookAaron Kennedy2010-04-152-2/+13
* Make sure richtext wraps correctly with a fixed height set.Martin Jones2010-04-151-1/+1
* Output script errors in ScriptAction and StateChangeScriptMartin Jones2010-04-152-0/+13
* 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-143-6/+12
|\
| * Updates to the module documentationmae2010-04-142-4/+10
* | 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-145-2/+30
* | | Image with PreserveAspect enabled with either width or height defined should ...Joona Petrell2010-04-141-0/+6
* | | Reduce warnings at shutdownAaron Kennedy2010-04-145-9/+10
* | | Fix QT_NO_DESKTOPSERVICESTasuku Suzuki2010-04-141-2/+8
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alexis Menard2010-04-145-5/+16
|\ \ \
| * | | Compiled bindings should not print warnings where normal bindings don'tAaron Kennedy2010-04-141-3/+1
| * | | Include qvariant.h as a convenience as context propertiesBea Lam2010-04-141-0/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1410-73/+357
| |\ \ \
| | * | | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-141-1/+1
| * | | | Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystemMartin Jones2010-04-142-1/+13
* | | | | Merge branch '4.7' into reviews/2361Alexis Menard2010-04-1498-1225/+2580
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-149-72/+356
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-141-1/+1
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-142-6/+6
| | |\ \ \
| | * | | | Don't warn on signals emitted after the context has been destroyedAaron Kennedy2010-04-141-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-142-6/+6
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Doc fix.Michael Brasser2010-04-142-6/+6
| | |/ / /