summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/ecmascriptblocks.qdoc4
-rw-r--r--doc/src/declarative/pics/trivialListView.pngbin6160 -> 5918 bytes
-rw-r--r--doc/src/declarative/qmlintro.qdoc2
3 files changed, 5 insertions, 1 deletions
diff --git a/doc/src/declarative/ecmascriptblocks.qdoc b/doc/src/declarative/ecmascriptblocks.qdoc
index 6ee5a8e..470d942 100644
--- a/doc/src/declarative/ecmascriptblocks.qdoc
+++ b/doc/src/declarative/ecmascriptblocks.qdoc
@@ -54,6 +54,10 @@ assigned to an object property or given an id. The included ECMAScript is evalu
in a scope chain. The \l {QML Scope} documentation covers the specifics of scoping
in QML.
+Note that if you are adding a function that should be called by external elements,
+you do not need the \l Script element. See \l {Extending types from QML#Adding new methods}
+{Adding new methods} for information about adding slots that can be called externally.
+
\section1 Inline Script
Small blocks of ECMAScript can be included directly inside a \l {QML Document} as
diff --git a/doc/src/declarative/pics/trivialListView.png b/doc/src/declarative/pics/trivialListView.png
index 3782570..dc5c6b3 100644
--- a/doc/src/declarative/pics/trivialListView.png
+++ b/doc/src/declarative/pics/trivialListView.png
Binary files differ
diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index 76d915f..8141c90 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -121,7 +121,7 @@ Item {
}
Text {
id: text2
- text: Text1.text
+ text: text1.text
}
}
\endcode