summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/scope.qdoc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-03 07:40:00 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-03 07:40:00 (GMT)
commitcb16e0adba54015963f2cd8a3f0188965c0c9ef8 (patch)
treef8bd04e549899b30658ff9cde26a0e8870f62847 /doc/src/declarative/scope.qdoc
parent6abdaa41a3f40238e8a60b80b9ac55a694181e11 (diff)
downloadQt-cb16e0adba54015963f2cd8a3f0188965c0c9ef8.zip
Qt-cb16e0adba54015963f2cd8a3f0188965c0c9ef8.tar.gz
Qt-cb16e0adba54015963f2cd8a3f0188965c0c9ef8.tar.bz2
We use JavaScript, not ECMAScript.
Task-number: QTBUG-7720
Diffstat (limited to 'doc/src/declarative/scope.qdoc')
-rw-r--r--doc/src/declarative/scope.qdoc8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index ef30f94..defb217 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -45,16 +45,16 @@
\tableofcontents
-\l {Property Binding}s and \l {ECMAScript Blocks} are executed in a scope chain automatically
+\l {Property Binding}s and \l {JavaScript Blocks} are executed in a scope chain automatically
established by QML when a component instance is constructed. QML is a \e {dynamically scoped}
language. Different object instances instantiated from the same component can exist in
different scope chains.
\image qml-scope.png
-\section1 ECMAScript Variable object
+\section1 JavaScript Variable object
-Each binding and script block has its own distinct ECMAScript variable object where local
+Each binding and script block has its own distinct JavaScript variable object where local
variables are stored. That is, local variables from different bindings and script blocks never
conflict.
@@ -375,6 +375,6 @@ Rectangle {
\section1 QML Global Object
-The \l {QML Global Object} contains all the properties of the ECMAScript global object, plus some
+The \l {QML Global Object} contains all the properties of the JavaScript global object, plus some
QML specific extensions.
*/