diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:34:15 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:34:15 +0200 |
| commit | b365ffa8a9bd7273f9f826087df57e32138b88f5 (patch) | |
| tree | 0bd09d25ed23c2baaa4decba4fda39f6eef2761a /src/doc/src/declarative/focus.qdoc | |
| parent | e3b5fcca3826d917076c2d4ab349598dd5799048 (diff) | |
| parent | f9df0b99470f905289126f253ede978b611d6333 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ic423a5bbe47dfa2b5d432e1af1032067d68b22e6
Diffstat (limited to 'src/doc/src/declarative/focus.qdoc')
| -rw-r--r-- | src/doc/src/declarative/focus.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/src/declarative/focus.qdoc b/src/doc/src/declarative/focus.qdoc index 7ed80b05..3d0dde98 100644 --- a/src/doc/src/declarative/focus.qdoc +++ b/src/doc/src/declarative/focus.qdoc @@ -56,8 +56,8 @@ is delivered to it. Otherwise, regular Qt key handling continues. stops. Otherwise the event is "bubbled up", by recursively passing it to each Item's parent until either the event is accepted, or the root Item is reached. -If the \c {Rectangle} element in the following example has active focus and the \c A key is pressed, -it will bubble up to its parent. However, pressing the \c B key will bubble up to the root +If the \c {Rectangle} type in the following example has active focus and the \c A key is pressed, +the event will not be propagated further. Pressing the \c B key the event will propagate to the root item and thus subsequently be ignored. \snippet doc/src/snippets/declarative/focus/rectangle.qml simple key event |