summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/focus.qdoc6
-rw-r--r--doc/src/tutorials/declarative.qdoc2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index c92632b..8733b2d 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -76,12 +76,12 @@ Item {
\section1 Querying the Active Focus Item
Whether or not an \l Item has \e {active focus} can be queried through the
-read-only property \c {Item::activeFocus}. For example, here we have a \l Text
+read-only property \c {Item::focus}. For example, here we have a \l Text
element whose text is determined by whether or not it has \e {active focus}.
\code
Text {
- text: activeFocus ? "I have active focus!" : "I do not have active focus"
+ text: focus ? "I have active focus!" : "I do not have active focus"
}
\endcode
@@ -208,7 +208,7 @@ Conceptually \e {focus scopes} are quite simple.
\o Within each \e {focus scope} one element may have \c {Item::focus} set to true. If more than one \l Item has the \c {Item::focus} property set, the first is selected and the others are unset, just like when there are no \e {focus scopes}.
\o When a \e {focus scope} receives \e {active focus}, the contained element with \c {Item::focus} set (if any) also gets \e {active focus}. If this element is
also a \l FocusScope, the proxying behaviour continues. Both the
-\e {focus scope} and the sub-focused item will have \c {Item::activeFocus} set.
+\e {focus scope} and the sub-focused item will have \c {Item::focus} set.
\endlist
So far the example has the second component statically selected. It is trivial
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 48beabd..bbc3d15 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -500,7 +500,7 @@
to receive focus
\endlist
- The read-only property activeFocus can be used to determine whether a
+ The read-only property focus can be used to determine whether a
component will receive key input. Any un-handled keys will be passed to
the components parent, which in turn will pass keys it doesn't handle up to its
own ancestors.