diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2012-11-30 17:44:47 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-01 08:31:19 +0100 |
commit | 93fe107b3afd0a03ba1ef16f72e49d1f54c19a40 (patch) | |
tree | 8a9049c2a53fe5be71e9cc736029427113ee23c0 | |
parent | 36e744845d0dc74732613431332c3665c4c149ea (diff) |
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>
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 | ||||
-rw-r--r-- | src/gui/kernel/qevent.cpp | 2 | ||||
-rw-r--r-- | src/widgets/doc/src/qtwidgets-index.qdoc | 1 | ||||
-rw-r--r-- | src/widgets/doc/src/widgets-and-layouts/focus.qdoc | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicswidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 4 |
6 files changed, 7 insertions, 6 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index f588f4ee08..363c5206b0 100644 --- 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 66434f9a53..5973386413 100644 --- 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 8fa3508b53..e40c0c3ecf 100644 --- 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 3379c6a948..d74841483b 100644 --- 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 c94d027cbe..abbcc83474 100644 --- 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 d05f53697a..f5ac598285 100644 --- 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) { |