diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-03 07:40:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-03 07:40:00 (GMT) |
| commit | cb16e0adba54015963f2cd8a3f0188965c0c9ef8 (patch) | |
| tree | f8bd04e549899b30658ff9cde26a0e8870f62847 /src/declarative/qml | |
| parent | 6abdaa41a3f40238e8a60b80b9ac55a694181e11 (diff) | |
| download | Qt-cb16e0adba54015963f2cd8a3f0188965c0c9ef8.zip Qt-cb16e0adba54015963f2cd8a3f0188965c0c9ef8.tar.gz Qt-cb16e0adba54015963f2cd8a3f0188965c0c9ef8.tar.bz2 | |
We use JavaScript, not ECMAScript.
Task-number: QTBUG-7720
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qmlexpression.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qmlscript.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp index 3e8d71a..ff1705b 100644 --- a/src/declarative/qml/qmlexpression.cpp +++ b/src/declarative/qml/qmlexpression.cpp @@ -184,7 +184,7 @@ QScriptValue QmlExpressionPrivate::evalInObjectScope(QmlContext *context, QObjec /*! \class QmlExpression - \brief The QmlExpression class evaluates ECMAScript in a QML context. + \brief The QmlExpression class evaluates JavaScript in a QML context. */ /*! @@ -212,7 +212,7 @@ QmlExpression::QmlExpression(QmlContext *ctxt, void *expr, /*! Create a QmlExpression object. - The \a expression ECMAScript will be executed in the \a ctxt QmlContext. + The \a expression JavaScript will be executed in the \a ctxt QmlContext. If specified, the \a scope object's properties will also be in scope during the expression's execution. */ diff --git a/src/declarative/qml/qmlscript.cpp b/src/declarative/qml/qmlscript.cpp index ba62898..10fc9a6 100644 --- a/src/declarative/qml/qmlscript.cpp +++ b/src/declarative/qml/qmlscript.cpp @@ -70,7 +70,7 @@ defining functions that are only executed later once the context is fully defined. - \sa {ECMAScript Blocks} + \sa {JavaScript Blocks} */ /*! |