summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'qtruntime'Roberto Raggi2010-02-2312-245/+774
|\
| * Get rid of QmlModulePlugin.Roberto Raggi2010-02-234-200/+0
| |
| * Look for QML plugins in the paths specified in QML_PLUGIN_PATH env var.Roberto Raggi2010-02-234-6/+31
| |
| * Added QmlEnginePrivate::resolvePlugin.Roberto Raggi2010-02-232-3/+92
| | | | | | | | | | resolvePlugin returns the merge of the plugin's base name with the platform suffix (e.g. .dylib) and prefix (e.g. lib).
| * Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2344-488/+964
| |\
| * | Load QML extensions.Roberto Raggi2010-02-227-25/+62
| | | | | | | | | | | | | | | | | | | | | This allows projects which use the QtDeclarative module to register QML types and functions through C++ extensions. Reviewed-by: mae
| * | Document the QmlExtensionPlugin interface.Roberto Raggi2010-02-223-0/+157
| | |
| * | Compile.Roberto Raggi2010-02-221-2/+0
| | |
| * | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2285-1666/+1350
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h
| * | | Introduced QmlEngine::importExtension.Roberto Raggi2010-02-222-1/+21
| | | | | | | | | | | | | | | | importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine.
| * | | Get rid of the unfriendly ImportedNamespace::isBuiltin flag.Roberto Raggi2010-02-191-27/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The `isBuiltin' flag doesn't play nice with hybrid apps where the types in a namespace are provided by both C++ and QML code. Done-with: mae
| * | | Added QmlExtensionPlugin and QmlExtensionInterface.Roberto Raggi2010-02-194-2/+75
| | | |
| * | | Introduced a new parser for qmldir files.Roberto Raggi2010-02-194-20/+352
| | | |
| * | | Introduced the internal virtual method QmlView::setRootObject(object).Roberto Raggi2010-02-192-45/+54
| | | | | | | | | | | | | | | | Done-with: mae
* | | | Fix build on solarisAlan Alpert2010-02-231-1/+1
| | | |
* | | | Doc fixAlan Alpert2010-02-231-1/+1
| | | | | | | | | | | | | | | | Remove stray '>'
* | | | More precise compiler errorsAlan Alpert2010-02-231-2/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | People were having trouble figureing what was wrong based off the previous error message. This should now be rectified - at least for users who read the docs. Reviewed-by: mae
* | | String to enum conversion in value typesAaron Kennedy2010-02-235-12/+38
| | | | | | | | | | | | | | | | | | Assigning a string to a value type enum property from a binding was not working as QmlMetaProperty didn't realise the property was of enum type.
* | | Adds QmlEasingValueType to qmlLeonardo Sobral Cunha2010-02-235-123/+178
| | | | | | | | | | | | | | | | | | | | | | | | Now it's possible to use easing curve types directly in qml as value types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the former ugly string format, like "easeOutBounce(amplitude:3.0)". Reviewed-by: akennedy
* | | Add missing NOTIFY signals to positioners, particles and webviewJoona Petrell2010-02-236-42/+161
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2327-260/+353
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2327-233/+373
| |\ \ \
| | * | | QmlExpression API reviewAaron Kennedy2010-02-2312-65/+38
| | | | |
| | * | | Make QmlBinding (and friends) privateAaron Kennedy2010-02-2318-164/+167
| | | | | | | | | | | | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now.
| * | | | Doc fix.Bea Lam2010-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-23306-3008/+3090
| |\ \ \ \
| * | | | | Add XmlRole::isKey property for incremental data changes when reload()Bea Lam2010-02-231-29/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is called. Task-number: QT-2831
* | | | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-233-29/+37
| |_|/ / / |/| | | | | | | | | | | | | | Task-number: QT-2538
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-232-17/+19
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix but in QmlMetaProperty assignment operatorAaron Kennedy2010-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | QTBUG-8166
| * | | | Small QmlMetaProperty code cleanupAaron Kennedy2010-02-231-16/+16
| | | | |
| * | | | Better support modelData for object list models.Michael Brasser2010-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | modelData will now correctly return the actual object.
* | | | | Add support for setting the root index when using a QAbstractItemModel.Martin Jones2010-02-232-4/+168
|/ / / / | | | | | | | | | | | | Task-number: QT-2777
* | | | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2264-1432/+1123
|\ \ \
| * | | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2264-1432/+1123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
* | | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-221-0/+5
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-2210-93/+83
| |\ \ \
| * | | | Update QmlChanges with animation API changes.Michael Brasser2010-02-221-0/+5
| | |_|/ | |/| |
* | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-2214-124/+127
| |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-227-66/+65
|\ \ \
| * | | Fix compile error on SolarisAaron Kennedy2010-02-227-66/+65
| |/ / | | | | | | | | | | | | QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename it to QmlTimeLineCallback to more represent what it is).
* | | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | | | | | | | | | | | Task-number: QTBUG-8181
* | | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
|/ /
* | Revert "Speed up QmlGraphicsItem::setParentItem."Bjørn Erik Nilsen2010-02-191-5/+1
| | | | | | | | | | | | | | | | | | This reverts commit 282a46ab5edafa7b82e9c58658143cb979db2d85. This change introduced some regression due to itemChange notifications not being delivered as expected (reported by Warwick). We have to find another solution, unfortunately. However, the performance penalty isn't that big so we can live with it for now.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-191-3/+6
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-192-8/+1
| |\ \
| * | | Delete the QmlImageRequestHandler in the correct thread.Martin Jones2010-02-191-3/+6
| | | |
* | | | More strict type checking of ListElement properties.Warwick Allison2010-02-192-10/+40
| |/ / |/| | | | | | | | Task-number: QTBUG-6203