summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/dynamicobjects.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/dynamicobjects.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/dynamicobjects.qdoc')
-rw-r--r--doc/src/declarative/dynamicobjects.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index c8ea981..fede2cd 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -44,13 +44,13 @@
\title Dynamic Object Creation
QML has some support for dynamically loading and managing QML objects from
-within ECMAscript blocks. It is preferable to use the existing QML elements for
+within Javascript blocks. It is preferable to use the existing QML elements for
dynamic object management wherever possible; these are \l{Loader},
\l{Repeater}, \l{ListView}, \l{GridView} and \l{PathView}. It is also possible
to dynamically create and manage objects from C++, and this is preferable for
hybrid QML/C++ applications - see \l{Using QML in C++ Applications}.
Dynamically creating and managing objects from
-within ECMAscript blocks is intended for when none of the existing QML elements
+within Javascript blocks is intended for when none of the existing QML elements
fit the needs of your application, and you do not desire for your application
to involve C++ code.