Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qtruntime' | Roberto Raggi | 2010-02-23 | 12 | -245/+774 |
|\ | |||||
| * | Get rid of QmlModulePlugin. | Roberto Raggi | 2010-02-23 | 4 | -200/+0 |
| | | |||||
| * | Look for QML plugins in the paths specified in QML_PLUGIN_PATH env var. | Roberto Raggi | 2010-02-23 | 4 | -6/+31 |
| | | |||||
| * | Added QmlEnginePrivate::resolvePlugin. | Roberto Raggi | 2010-02-23 | 2 | -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 qtruntime | Roberto Raggi | 2010-02-23 | 44 | -488/+964 |
| |\ | |||||
| * | | Load QML extensions. | Roberto Raggi | 2010-02-22 | 7 | -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 Raggi | 2010-02-22 | 3 | -0/+157 |
| | | | |||||
| * | | Compile. | Roberto Raggi | 2010-02-22 | 1 | -2/+0 |
| | | | |||||
| * | | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-22 | 85 | -1666/+1350 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h | ||||
| * | | | Introduced QmlEngine::importExtension. | Roberto Raggi | 2010-02-22 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | | importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine. | ||||
| * | | | Get rid of the unfriendly ImportedNamespace::isBuiltin flag. | Roberto Raggi | 2010-02-19 | 1 | -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 Raggi | 2010-02-19 | 4 | -2/+75 |
| | | | | |||||
| * | | | Introduced a new parser for qmldir files. | Roberto Raggi | 2010-02-19 | 4 | -20/+352 |
| | | | | |||||
| * | | | Introduced the internal virtual method QmlView::setRootObject(object). | Roberto Raggi | 2010-02-19 | 2 | -45/+54 |
| | | | | | | | | | | | | | | | | Done-with: mae | ||||
* | | | | Fix build on solaris | Alan Alpert | 2010-02-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Doc fix | Alan Alpert | 2010-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Remove stray '>' | ||||
* | | | | More precise compiler errors | Alan Alpert | 2010-02-23 | 1 | -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 types | Aaron Kennedy | 2010-02-23 | 5 | -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 qml | Leonardo Sobral Cunha | 2010-02-23 | 5 | -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 webview | Joona Petrell | 2010-02-23 | 6 | -42/+161 |
| | | | | | | | | | | | | Reviewed-by: Aaron Kennedy | ||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 27 | -260/+353 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 27 | -233/+373 |
| |\ \ \ | |||||
| | * | | | QmlExpression API review | Aaron Kennedy | 2010-02-23 | 12 | -65/+38 |
| | | | | | |||||
| | * | | | Make QmlBinding (and friends) private | Aaron Kennedy | 2010-02-23 | 18 | -164/+167 |
| | | | | | | | | | | | | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now. | ||||
| * | | | | Doc fix. | Bea Lam | 2010-02-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831 | ||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 306 | -3008/+3090 |
| |\ \ \ \ | |||||
| * | | | | | Add XmlRole::isKey property for incremental data changes when reload() | Bea Lam | 2010-02-23 | 1 | -29/+146 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is called. Task-number: QT-2831 | ||||
* | | | | | | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 3 | -29/+37 |
| |_|/ / / |/| | | | | | | | | | | | | | | Task-number: QT-2538 | ||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 2 | -17/+19 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fix but in QmlMetaProperty assignment operator | Aaron Kennedy | 2010-02-23 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | QTBUG-8166 | ||||
| * | | | | Small QmlMetaProperty code cleanup | Aaron Kennedy | 2010-02-23 | 1 | -16/+16 |
| | | | | | |||||
| * | | | | Better support modelData for object list models. | Michael Brasser | 2010-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | modelData will now correctly return the actual object. | ||||
* | | | | | Add support for setting the root index when using a QAbstractItemModel. | Martin Jones | 2010-02-23 | 2 | -4/+168 |
|/ / / / | | | | | | | | | | | | | Task-number: QT-2777 | ||||
* | | | | Make uncached text painting work for richtext too. | Martin Jones | 2010-02-23 | 2 | -3/+12 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-22 | 64 | -1432/+1123 |
|\ \ \ | |||||
| * | | | Replace QmlList* and QList* support with a single QmlListProperty type | Aaron Kennedy | 2010-02-22 | 64 | -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 Jones | 2010-02-22 | 1 | -17/+12 |
|/ / / | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-22 | 1 | -0/+5 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Michael Brasser | 2010-02-22 | 10 | -93/+83 |
| |\ \ \ | |||||
| * | | | | Update QmlChanges with animation API changes. | Michael Brasser | 2010-02-22 | 1 | -0/+5 |
| | |_|/ | |/| | | |||||
* | | | | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 14 | -124/+127 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-22 | 7 | -66/+65 |
|\ \ \ | |||||
| * | | | Fix compile error on Solaris | Aaron Kennedy | 2010-02-22 | 7 | -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 EaseFollow | Martin Jones | 2010-02-22 | 1 | -1/+10 |
| | | | | | | | | | | | | Task-number: QTBUG-8181 | ||||
* | | | Remove use of unexprted private classes. | Martin Jones | 2010-02-22 | 2 | -26/+8 |
|/ / | |||||
* | | Revert "Speed up QmlGraphicsItem::setParentItem." | Bjørn Erik Nilsen | 2010-02-19 | 1 | -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-qml | Warwick Allison | 2010-02-19 | 1 | -3/+6 |
|\ \ | |||||
| * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-19 | 2 | -8/+1 |
| |\ \ | |||||
| * | | | Delete the QmlImageRequestHandler in the correct thread. | Martin Jones | 2010-02-19 | 1 | -3/+6 |
| | | | | |||||
* | | | | More strict type checking of ListElement properties. | Warwick Allison | 2010-02-19 | 2 | -10/+40 |
| |/ / |/| | | | | | | | | Task-number: QTBUG-6203 |