diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 03:00:41 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-10 03:00:41 +0100 |
commit | 41dd1405d5c5bfac05f9c42a4c4017de5075f5cc (patch) | |
tree | 4274b78b41dd1676d717e06d81f77e9b52b18974 /src/quicktemplates2/qquickapplicationwindow.cpp | |
parent | 2f4726883b17fe2c935ac2e5d1bfa9b2bca8b5e3 (diff) | |
parent | 031a1e89e1baa952225c0f036b605f591f554e9b (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id5cd236e14238612647f7a897886be0202863132
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
-rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index c5c23695..370f47bb 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -59,6 +59,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick.Controls \since 5.7 \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols2-focusscopes \brief Styled top-level window with support for a header and footer. ApplicationWindow is a \l Window which makes it convenient to add @@ -110,7 +111,8 @@ QT_BEGIN_NAMESPACE certain window \c id. A QML component that uses the ApplicationWindow attached properties works in any window regardless of its \c id. - \sa {Customizing ApplicationWindow}, Overlay, Page, {Container Controls} + \sa {Customizing ApplicationWindow}, Overlay, Page, {Container Controls}, + {Focus Management in Qt Quick Controls 2} */ static const QQuickItemPrivate::ChangeTypes ItemChanges = QQuickItemPrivate::Visibility |