diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-21 03:05:59 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-21 03:05:59 +0100 |
| commit | 62c8ae30880886f3ed17ddc17713db1a7410964e (patch) | |
| tree | d573dda83de51f6fd839395f526b6fb526fdec52 /src/imports/controls | |
| parent | 418cb72b9346ddb258cb1384fd6b95af143c2059 (diff) | |
| parent | ac9d427cd22e9b0c820dafd68ab17cca930c841d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I9ecddc7a68da4f15ee2c2904e237496eb6a2aa26
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-index.qdoc | 4 | ||||
| -rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 395f3b36..ac306aaa 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -46,9 +46,9 @@ The \l{Qt Quick Controls QML Types}{QML types} can be imported into your application using the following import statement in your \c {.qml} file: - \code \QtMinorVersion + \qml \QtMinorVersion import QtQuick.Controls 2.\1 - \endcode + \endqml The \l{Qt Quick Controls C++ Classes}{C++ classes} can be included into your application using the following include statement: diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index 360d2059..7fbc8c4d 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -40,9 +40,9 @@ Qt Quick Controls QML types can be imported into your application using the following import statement in your .qml file: - \badcode \QtMinorVersion + \qml \QtMinorVersion import QtQuick.Controls 2.\1 - \endcode + \endqml \section1 QML Types \generatelist {qmltypesbymodule QtQuick.Controls} |