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-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/controls/doc/src/qtquickcontrols2-qmltypes.qdoc')
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index a28b2974..c8c44264 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -31,13 +31,13 @@ \title Qt Quick Controls QML Types \keyword Qt Quick Controls 2 QML Types \ingroup qmlmodules - \brief Provides QML types for user interfaces (Qt Quick Controls 2). + \brief Provides QML types for user interfaces (Qt Quick Controls). - \l{Qt Quick Controls 2} provides QML types for creating user interfaces. + \l{Qt Quick Controls} provides QML types for creating user interfaces. These QML types work in conjunction with \l{Qt Quick} and \l{Qt Quick Layouts}. - Qt Quick Controls 2 QML types can be imported into your application + Qt Quick Controls QML types can be imported into your application using the following import statement in your .qml file: \badcode \QtMinorVersion @@ -48,11 +48,11 @@ \generatelist {qmltypesbymodule QtQuick.Controls} \noautolist - For more information on the Qt Quick Controls 2 module, see the - \l {Qt Quick Controls 2} module documentation. + For more information on the Qt Quick Controls module, see the + \l {Qt Quick Controls} module documentation. \section1 Related Information \list - \li \l {Qt Quick Controls 2 Guidelines} + \li \l {Qt Quick Controls Guidelines} \endlist */ |