summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-23156-1167/+3092
|\ | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
| * Added missing destructor to QmlExtensionInterface.Roberto Raggi2010-02-231-0/+1
| |
| * Merge branch 'qtruntime'Roberto Raggi2010-02-2324-277/+811
| |\
| | * Get rid of the useless import 'files'Roberto Raggi2010-02-231-1/+0
| | | | | | | | | | | | Reviewed-by: mae
| | * Fixed the install rules for the QML plugins example.Roberto Raggi2010-02-231-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | Install the QML components in $[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample and the source files in $[QT_INSTALL_EXAMPLES]/declarative/plugins/
| | * Added the qmldir file for declarative plugins exampleThorbjørn Lindeijer2010-02-231-0/+2
| | |
| | * Get rid of QmlModulePlugin.Roberto Raggi2010-02-2314-228/+29
| | |
| | * 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).
| | * Fix compile error in QEasingCurveLeonardo Sobral Cunha2010-02-231-3/+3
| | | | | | | | | | | | Reviewed-by: akennedy
| | * Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-23138-932/+2354
| | |\
| | * | 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-221497-67480/+141764
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Avoiding PlatSec warnings for Symbian devicesAleksandar Sasha Babic2010-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Fix build on solarisAlan Alpert2010-02-231-1/+1
| | | | |
| * | | | Fixing deployment and default values for SymbianAleksandar Sasha Babic2010-02-232-0/+26
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Fixing deplyment on Symbian platformAleksandar Sasha Babic2010-02-232-1/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Fixing deployment on SymbianAleksandar Sasha Babic2010-02-232-2/+13
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Fixing deployment on SymbianAleksandar Sasha Babic2010-02-231-0/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-233-2/+19
| |\ \ \ \
| | * | | | Fixing deployment on Symbian platformAleksandar Sasha Babic2010-02-232-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | Fixing deployment on SymbianAleksandar Sasha Babic2010-02-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | | 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
| * | | | Fix compile error in QEasingCurveLeonardo Sobral Cunha2010-02-231-3/+3
| | |_|/ | |/| | | | | | | | | | Reviewed-by: akennedy
| * | | String to enum conversion in value typesAaron Kennedy2010-02-238-12/+71
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Updates all qml examples/demos to use the easing curve value type syntaxLeonardo Sobral Cunha2010-02-2341-162/+164
| | | |
| * | | Adds QmlEasingValueType to qmlLeonardo Sobral Cunha2010-02-237-181/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 QEasingCurve as builtin metatypeLeonardo Sobral Cunha2010-02-237-11/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for qml, in order to be able to use easing as a valuetype. Task-number: QTBUG-8235 Reviewed-by: thierry Reviewed-by: janarve
| * | | Add missing NOTIFY signals to positioners, particles and webviewJoona Petrell2010-02-2312-43/+521
| | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2334-279/+616
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2334-252/+383
| | |\ \ \
| | | * | | QmlExpression API reviewAaron Kennedy2010-02-2315-70/+45
| | | | | |
| | | * | | Make QmlBinding (and friends) privateAaron Kennedy2010-02-2321-178/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-232056-71182/+160302
| | |\ \ \ \
| | * | | | | Add XmlRole::isKey property for incremental data changes when reload()Bea Lam2010-02-232-29/+400
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is called. Task-number: QT-2831
| * | | | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-2320-180/+123
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Task-number: QT-2538
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2313-58/+148
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Doc.Michael Brasser2010-02-231-6/+6
| | | | | |
| * | | | | Add support for setting the root index when using a QAbstractItemModel.Martin Jones2010-02-233-4/+169
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2777
* | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-23113-649/+984
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2798
* | | | | | Make executable outside dir.Warwick Allison2010-02-231-3/+3
| |/ / / / |/| | | |