summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-06 15:07:35 +1000
committerMartin Jones <martin.jones@nokia.com>2009-05-06 15:07:35 +1000
commit10f17b5a6aa10e3733007430e9274ba8e0707099 (patch)
tree30ab9901e360c3653d13084d65ea347ba6d65b88 /doc
parentbcfb24b17cf5c97c734c82ca2072eb8b13b80eec (diff)
downloadqt4-tools-10f17b5a6aa10e3733007430e9274ba8e0707099.tar.gz
Docs.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/focus.qdoc4
-rw-r--r--doc/src/declarative/qtprogrammers.qdoc2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index bb54852eb1..e5c181d966 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -50,7 +50,7 @@ An \l Item requests focus by setting the \c {Item::focus} property to true.
For very simple cases simply setting the \c {Item::focus} property is sometimes
sufficient. If we run the following example in the \c qmlviewer, we see that
-the \c {<KeyActions/>} element has \e {active focus} and pressing the
+the \c {KeyActions} element has \e {active focus} and pressing the
\e A, \e B, or \e C keys modifies the text appropriately.
\table
@@ -244,7 +244,7 @@ property. As the \l ListView is a \e {focus realm}, this doesn't effect the
rest of the application. However, if the \l ListView itself has
\e {active focus} this causes the delegate itself to receive \e {active focus}.
In this example, the root element of the delegate is also a \e {focus realm},
-which in turn gives \e {active focus} to the \c {<KeyActions/>} element that
+which in turn gives \e {active focus} to the \c {KeyActions} element that
actually performs the work of handling the \e {Return} key.
All of the fluid UI view classes, such as \l PathView and \l GridView, behave
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index b63ebbbdda..a79c671345 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -18,7 +18,7 @@ QML provides direct access to the following concepts from Qt:
\o QObject signals and slots - available as functions to call in JavaScript
\o QObject properties - available as variables in JavaScript
\o QWidget - QFxView is a QML-displaying widget
- \o Qt models - used directly in data binding (currently only next generation QListModelInterface)
+ \o Qt models - used directly in data binding (QAbstractItemModel and next generation QListModelInterface)
\endlist
Qt knowledge is \e required for \l {cppitem}{writing elements in C++}.