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/calendar/doc/src | |
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/calendar/doc/src')
-rw-r--r-- | src/imports/calendar/doc/src/qtlabscalendar-index.qdoc | 2 | ||||
-rw-r--r-- | src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc b/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc index 517dbdb1..065379ec 100644 --- a/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc +++ b/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc @@ -46,6 +46,6 @@ \list \li \l{Qt Quick} \li \l{Qt Quick Layouts} - \li \l{Qt Quick Controls 2} + \li \l{Qt Quick Controls} \endlist */ diff --git a/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc index 29b1a2c0..81abf52a 100644 --- a/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc +++ b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc @@ -33,7 +33,7 @@ The \l{Qt Labs Calendar} module provides QML types for creating calendars. These QML types work in conjunction with \l{Qt Quick} and - \l{Qt Quick Controls 2}. + \l{Qt Quick Controls}. The QML types can be imported into your application using the following import statement in your .qml file: @@ -51,7 +51,7 @@ \section1 Related Information \list - \li \l {Qt Quick Controls 2 QML Types} + \li \l {Qt Quick Controls QML Types} \endlist \noautolist |