diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:51:20 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-15 13:55:22 +0200 |
| commit | 6f617349cf865ca3a7befc0dd472b7c2510fc431 (patch) | |
| tree | 37e70da54a7f3101b82551ccd98508f8d9d64330 /src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc | |
| parent | 718e08392f34dc478ea010c08a4b9c77bb665dfc (diff) | |
| parent | 8e2d1b1efe736760d27af17160f662454546b054 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Removed dependencies.yaml.
Change-Id: I1e2b3f486e9ace4bc8dc0419a64848990b3a6b39
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc index 7cc84ed6..95928d13 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc @@ -31,7 +31,7 @@ \ingroup qtquickcontrols2-guidelines \brief Guidelines for navigation controls - Qt Quick Controls 2 offers a selection of navigation models. + Qt Quick Controls offers a selection of navigation models. \annotatedlist qtquickcontrols2-navigation @@ -55,7 +55,7 @@ scrolling. The page indicator on the bottom shows which is the presently active page. - \section1 TabBar + \section1 TabBar Control \image qtquickcontrols2-tabbar-wireframe.png |