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 18:51:21 +0200 |
| commit | 42aaff003d27ed9ba75d48a4e02a83fd5c1eade9 (patch) | |
| tree | 2c8a5d2ec58e7be3c3af51f88cf6d05864df6f34 /src/quicktemplates2/qquicktabbar.cpp | |
| parent | 6b55e00eb94b138f39becac1bddaa5f3e42136dc (diff) | |
| parent | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I23522a8f71cea8d8e3f0155dad98e41c003774fb
Diffstat (limited to 'src/quicktemplates2/qquicktabbar.cpp')
| -rw-r--r-- | src/quicktemplates2/qquicktabbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp index 745023c3..5a439b4b 100644 --- a/src/quicktemplates2/qquicktabbar.cpp +++ b/src/quicktemplates2/qquicktabbar.cpp @@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE \snippet qtquickcontrols2-tabbar-flickable.qml 1 \sa TabButton, {Customizing TabBar}, {Navigation Controls}, {Container Controls}, - {Focus Management in Qt Quick Controls 2} + {Focus Management in Qt Quick Controls} */ class QQuickTabBarPrivate : public QQuickContainerPrivate |