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/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc | |
parent | 6b55e00eb94b138f39becac1bddaa5f3e42136dc (diff) | |
parent | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I23522a8f71cea8d8e3f0155dad98e41c003774fb
Diffstat (limited to 'src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc')
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc index ebb4b6b2..bea87abf 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-delegates.qdoc @@ -31,7 +31,7 @@ \ingroup qtquickcontrols2-guidelines \brief Guidelines for delegate controls - Qt Quick Controls 2 offers a selection of controls that are used as + Qt Quick Controls offers a selection of controls that are used as delegates in views. \annotatedlist qtquickcontrols2-delegates @@ -74,6 +74,6 @@ \section1 Related Information \list - \li \l {Qt Quick Controls 2 Guidelines} + \li \l {Qt Quick Controls Guidelines} \endlist */ |