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/qquicktabbar.cpp | |
| parent | 2f4726883b17fe2c935ac2e5d1bfa9b2bca8b5e3 (diff) | |
| parent | 031a1e89e1baa952225c0f036b605f591f554e9b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id5cd236e14238612647f7a897886be0202863132
Diffstat (limited to 'src/quicktemplates2/qquicktabbar.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktabbar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp index d86d9ec5..e2cd06fc 100644 --- a/src/quicktemplates2/qquicktabbar.cpp +++ b/src/quicktemplates2/qquicktabbar.cpp @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE \since 5.7 \ingroup qtquickcontrols2-navigation \ingroup qtquickcontrols2-containers + \ingroup qtquickcontrols2-focusscopes \brief Allows the user to switch between different views or subtasks. TabBar provides a tab-based navigation model. @@ -90,7 +91,8 @@ QT_BEGIN_NAMESPACE \snippet qtquickcontrols2-tabbar-flickable.qml 1 - \sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls} + \sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls}, + {Focus Management in Qt Quick Controls 2} */ class QQuickTabBarPrivate : public QQuickContainerPrivate |