Renamed the keyboard-focus doc to make clear it's about Widgets

Also link from the widgets index page.

Change-Id: I49cd415b09d7458d89d75931ecfaafe29c226c6f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index f588f4e..363c520 100644 (file)
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1759,7 +1759,7 @@
 
     \omitvalue NoFocusReason
 
-    \sa {Keyboard Focus}
+    \sa {Keyboard Focus in Widgets}
 */
 
 /*!

diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 66434f9..5973386 100644 (file)
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -1075,7 +1075,7 @@ bool QKeyEvent::matches(QKeySequence::StandardKey matchKey) const
     QWidget::focusOutEvent(), QGraphicsItem::focusInEvent and
     QGraphicsItem::focusOutEvent() receive focus events.
 
-    \sa QWidget::setFocus(), QWidget::setFocusPolicy(), {Keyboard Focus}
+    \sa QWidget::setFocus(), QWidget::setFocusPolicy(), {Keyboard Focus in Widgets}
 */
 
 /*!

diff --git a/src/widgets/doc/src/qtwidgets-index.qdoc b/src/widgets/doc/src/qtwidgets-index.qdoc
index 8fa3508..e40c0c3 100644 (file)
--- a/src/widgets/doc/src/qtwidgets-index.qdoc
+++ b/src/widgets/doc/src/qtwidgets-index.qdoc
@@ -71,6 +71,7 @@ interfaces
     \li \l{Window and Dialog Widgets}
     \li \l{Application Main Window}
     \li \l{Dialog Windows}
+    \li \l{Keyboard Focus in Widgets}
     \endlist
 
     \section1 Styles

diff --git a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
index 3379c6a..d748414 100644 (file)
--- a/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \page focus.html
-    \title Keyboard Focus
+    \title Keyboard Focus in Widgets
     \brief Keyboard focus management and handling.
     \ingroup frameworks-technologies
 

diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index c94d027..abbcc83 100644 (file)
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -2116,7 +2116,7 @@ QList<QAction *> QGraphicsWidget::actions() const
 
     By default, tab order is defined implicitly using widget creation order.
 
-    \sa focusPolicy, {Keyboard Focus}
+    \sa focusPolicy, {Keyboard Focus in Widgets}
 */
 void QGraphicsWidget::setTabOrder(QGraphicsWidget *first, QGraphicsWidget *second)
 {

diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index d05f536..f5ac598 100644 (file)
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -5878,7 +5878,7 @@ bool QWidget::hasFocus() const
 
     \sa hasFocus(), clearFocus(), focusInEvent(), focusOutEvent(),
     setFocusPolicy(), focusWidget(), QApplication::focusWidget(), grabKeyboard(),
-    grabMouse(), {Keyboard Focus}, QEvent::RequestSoftwareInputPanel
+    grabMouse(), {Keyboard Focus in Widgets}, QEvent::RequestSoftwareInputPanel
 */
 
 void QWidget::setFocus(Qt::FocusReason reason)
@@ -6240,7 +6240,7 @@ bool QWidget::isActiveWindow() const
     If \a first or \a second has a focus proxy, setTabOrder()
     correctly substitutes the proxy.
 
-    \sa setFocusPolicy(), setFocusProxy(), {Keyboard Focus}
+    \sa setFocusPolicy(), setFocusProxy(), {Keyboard Focus in Widgets}
 */
 void QWidget::setTabOrder(QWidget* first, QWidget *second)
 {