Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits)
  Doc: Added a missing license header.
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  doc: Replaced some \raw and \endraw uses with \table and \endtable
  Doc: Added a note about the Public Suffix List.
  Doc: Fixed doc bug in Diagram Scene example
  doc: Removed some empty \row commands from a table.
  Doc: Added link to QML Basic Types in main Qt Quick page.
  Doc: Added missing What's New information for Qt 4.6 and 4.7.
  Doc: Fixed incorrect case in a page file name.
  Doc: Added a link to the QML Basic Types page.
  Doc: Removed duplicate external page reference.
  Doc: Fixed a link to the correct searchPaths() function.
  Doc: Added documentation about the use of null custom title bar widgets.
  Doc: Added a missing external page reference.
  Fixed the QML Focus document. Fixed snippets, images, and formatting.
  Added QML coding convention for "private" properties.
  Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.
  Some whitespace fixes.
  Fixed a bug by changing the id name to lower case.
  ...

1 files changed, 23 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 75e4a0b..24d9b03 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -454,10 +454,18 @@ void QDeclarativeItemKeyFilter::componentComplete()
     \qmlproperty Item KeyNavigation::down
 
     These properties hold the item to assign focus to
-    when Key_Left, Key_Right, Key_Up or Key_Down are
+    when the left, right, up or down cursor keys are
     pressed.
 */
 
+/*!
+    \qmlproperty Item KeyNavigation::tab
+    \qmlproperty Item KeyNavigation::backtab
+
+    These properties hold the item to assign focus to
+    when the Tab key or Shift+Tab key combination (Backtab) are pressed.
+*/
+
 QDeclarativeKeyNavigationAttached::QDeclarativeKeyNavigationAttached(QObject *parent)
 : QObject(*(new QDeclarativeKeyNavigationAttachedPrivate), parent),
   QDeclarativeItemKeyFilter(qobject_cast<QDeclarativeItem*>(parent))
@@ -911,6 +919,20 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
 */
 
 /*!
+    \qmlsignal Keys::onTabPressed(KeyEvent event)
+
+    This handler is called when the Tab key has been pressed. The \a event
+    parameter provides information about the event.
+*/
+
+/*!
+    \qmlsignal Keys::onBacktabPressed(KeyEvent event)
+
+    This handler is called when the Shift+Tab key combination (Backtab) has
+    been pressed. The \a event parameter provides information about the event.
+*/
+
+/*!
     \qmlsignal Keys::onAsteriskPressed(KeyEvent event)
 
     This handler is called when the Asterisk '*' has been pressed. The \a event