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/platform/doc/src/qtlabsplatform-qmltypes.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/platform/doc/src/qtlabsplatform-qmltypes.qdoc')
| -rw-r--r-- | src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc index 57f011ef..dec67b72 100644 --- a/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc +++ b/src/imports/platform/doc/src/qtlabsplatform-qmltypes.qdoc @@ -33,7 +33,7 @@ The experimental \l{Qt Labs Platform} module provides QML types for native platform extensions. These QML types work in conjunction with \l{Qt Quick} - and \l{Qt Quick Controls 2}. + and \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 |