summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/focus.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-27 23:34:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-27 23:34:33 (GMT)
commitf5542efa32c0e28f28b361c554f9ae2c3f6fc546 (patch)
tree6c2a8b9a46fcda2c72b5318bca247c46fc0bf36a /doc/src/declarative/focus.qdoc
parentcdbb761416996efef99e6eccc7f42730d64f35cb (diff)
parent8faad8f5e7ddf03b4bf19ef51ddd1ad3c3b5f968 (diff)
downloadQt-f5542efa32c0e28f28b361c554f9ae2c3f6fc546.zip
Qt-f5542efa32c0e28f28b361c554f9ae2c3f6fc546.tar.gz
Qt-f5542efa32c0e28f28b361c554f9ae2c3f6fc546.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
Diffstat (limited to 'doc/src/declarative/focus.qdoc')
-rw-r--r--doc/src/declarative/focus.qdoc7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index 599d63c..940f864 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -28,11 +28,16 @@
/*!
\target qmlfocus
\page qdeclarativefocus.html
+\ingroup qml-features
+\contentspage QML Features
+\previouspage {QML Text Handling and Validators}{Text Handling and Validators}
+\nextpage {QML Signal and Handler Event System}{Signal and Handler Event System}
+
\title Keyboard Focus in QML
When a key is pressed or released, a key event is generated and delivered to the
focused QML \l Item. To facilitate the construction of reusable components
-and to address some of the cases unique to fluid user interfaces, the QML items add a
+and to address some of the cases unique to fluid user interfaces, the QML items add aged
\e scope based extension to Qt's traditional keyboard focus model.
\tableofcontents