diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:44 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:45 +0200 |
| commit | 3703d57161dc4ad7df000403bfcc43ac78eb6617 (patch) | |
| tree | 4ab8ca921336f38ca539b699c6f4c0d7dc3de949 /src/imports/templates/doc/src | |
| parent | 94fdd09199b3373bc6d6e9d9c873cd16d54184a5 (diff) | |
| parent | 567a5cf69ef39ba5e9d0558ee7d6caec4d69bf71 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ie9314e1a5daa20cee9d95a3c42873dbe515b3333
Diffstat (limited to 'src/imports/templates/doc/src')
| -rw-r--r-- | src/imports/templates/doc/src/qtquicktemplates2-index.qdoc | 4 | ||||
| -rw-r--r-- | src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc index d017a338..492785a4 100644 --- a/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc +++ b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc @@ -30,7 +30,7 @@ \title Qt Quick Templates 2 \brief A set of templates to create user interface controls in Qt Quick - Qt Quick Templates are the foundations of \l {Qt Quick Controls 2}. Templates + Qt Quick Templates are the foundations of \l {Qt Quick Controls}. Templates are non-visual implementations of controls' logic and behavior. They offer an interface to visualize the controls in QML using \l {Qt Quick}. @@ -48,7 +48,7 @@ \list \li \l{Qt Quick} - \li \l{Qt Quick Controls 2} + \li \l{Qt Quick Controls} \li \l{Qt Quick Templates 2 QML Types} \endlist */ diff --git a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc index 33ee08d3..1288e937 100644 --- a/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc +++ b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc @@ -56,7 +56,7 @@ \section1 Related Information \list - \li \l {Qt Quick Controls 2 QML Types} + \li \l {Qt Quick Controls QML Types} \endlist \noautolist |