diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-02 03:04:43 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-02 03:04:43 +0100 |
commit | 20fe7e673fb6959560479746071a337802616c0c (patch) | |
tree | 87240d44912bc019f3631f3a0f2c40cfb4c28fd6 /src/imports/controls | |
parent | 79464a7ef6e0ccf1714dba8221a082424cd13ac0 (diff) | |
parent | 9898744e2ea17e805da559faeb677c9f5bbe080f (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ida6e83517802b1e970f755b2e2128b77f08a8d11
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 |