diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-18 13:07:22 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-21 11:16:28 +0200 |
| commit | 02b4770c3d867bf0b562db63015a7137479db10a (patch) | |
| tree | 57157d0101a295fd394bf9acc91dd216fb361264 /src/quick/doc/src/concepts | |
| parent | 858c62583ff776edb8c9e539f0331f5d658de2d1 (diff) | |
| parent | 345226aa3ecee8642c3bf46e40c981d4a49d958e (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/qml/qml/qqmltypeloader.cpp
Change-Id: I07647700fc86764c95a5ef95c568e700a70fe45f
Diffstat (limited to 'src/quick/doc/src/concepts')
| -rw-r--r-- | src/quick/doc/src/concepts/input/focus.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/doc/src/concepts/input/focus.qdoc b/src/quick/doc/src/concepts/input/focus.qdoc index db84961d20..ec4e4ca2d9 100644 --- a/src/quick/doc/src/concepts/input/focus.qdoc +++ b/src/quick/doc/src/concepts/input/focus.qdoc @@ -117,7 +117,7 @@ the focus, but it cannot control the focus when it is imported or reused. Likewise, the \c window component does not have the ability to know if its imported components are requesting the focus. -To solve this problem, the QML introduces a concept known as a \e {focus scope}. +To solve this problem, QML introduces a concept known as a \e {focus scope}. For existing Qt users, a focus scope is like an automatic focus proxy. A focus scope is created by declaring the \l FocusScope type. |