diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 18:51:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 19:48:15 +0200 |
| commit | 7542a6bb74b27fcc39a5b82ef1e5f84853cda4e1 (patch) | |
| tree | 2c8a5d2ec58e7be3c3af51f88cf6d05864df6f34 /src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc | |
| parent | 6b55e00eb94b138f39becac1bddaa5f3e42136dc (diff) | |
| parent | 42aaff003d27ed9ba75d48a4e02a83fd5c1eade9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc index 7883db71..77bc9883 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-focus.qdoc @@ -27,10 +27,11 @@ /*! \page qtquickcontrols2-focus.html - \title Focus Management in Qt Quick Controls 2 - \brief Overview of focus handling with Qt Quick Controls 2 + \keyword Focus Management in Qt Quick Controls 2 + \title Focus Management in Qt Quick Controls + \brief Overview of focus handling with Qt Quick Controls - Qt Quick Controls 2 follows the standard + Qt Quick Controls follows the standard \l {Keyboard Focus in Qt Quick}{Qt Quick focus system}, while also providing some added convenience. For example, the \l {Control::}{focusPolicy} property can be used to control the ways in @@ -38,7 +39,7 @@ \section1 Focus Scope Controls - Qt Quick Controls 2 offers a selection of controls that act as + Qt Quick Controls offers a selection of controls that act as \l {Acquiring Focus and Focus Scopes}{focus scopes}: \annotatedlist qtquickcontrols2-focusscopes |