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/templates/doc/src/qtquicktemplates2-index.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/templates/doc/src/qtquicktemplates2-index.qdoc')
| -rw-r--r-- | src/imports/templates/doc/src/qtquicktemplates2-index.qdoc | 4 |
1 files changed, 2 insertions, 2 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 */ |