diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:07:11 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:07:11 +0100 |
commit | 6cc7a3cf11b25d18b0ddd8492a846ec2d724a28b (patch) | |
tree | 6ff696c83f65d29f8fe8d184e449e51fa6d97b66 /src/imports/controls | |
parent | 9eaa5bcb2e37f030e3f6e18f27d8f21c62d54d04 (diff) | |
parent | 611422b5968ceac6cfba034116a3d1e107d8e2df (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I80f13e604dd492954c742e0ddaa7efa393776a62
Diffstat (limited to 'src/imports/controls')
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc index c8c44264..360d2059 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule QtQuick.Controls 2.5 + \qmlmodule QtQuick.Controls 2.\QtMinorVersion \keyword Qt Quick Controls QML Types \title Qt Quick Controls QML Types \keyword Qt Quick Controls 2 QML Types |