From 1f4ee95dd07ca643335c6bc49d28ff170854c249 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 6 Nov 2020 16:01:11 +0100 Subject: Doc: update Versions section Since not everyone will switch to Qt 6 instantly, and the Qt 6 docs will become the "current" docs that users see when they search online, it's good to keep the information about older versions around. Change-Id: I7efa6efa5a25a10f292160f5cb53b2ef17ad6d57 Reviewed-by: Fabian Kosmale --- .../controls/doc/src/qtquickcontrols2-index.qdoc | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc index 6133f330..4238ba41 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -82,10 +82,15 @@ \section1 Versions - Qt Quick Controls.0 was introduced in Qt 5.7. Subsequent minor Qt releases + Qt Quick Controls 2.0 was introduced in Qt 5.7. Subsequent minor Qt releases increment the import version of the Qt Quick Controls modules by one, - until Qt 5.12, where the import versions match Qt's minor version. The - experimental Qt Labs modules use import version 1.0. + until Qt 5.12, where the import versions match Qt's minor version. + + In Qt 6, both the major and minor versions match, and version numbers may + be omitted from imports in QML. If the version is omitted, the latest + version will be used. + + The experimental Qt Labs modules use import version 1.0. \table \header @@ -95,8 +100,7 @@ \l {Material Style}{\c QtQuick.Controls.Material},\br \l {Universal Style}{\c QtQuick.Controls.Universal},\br \l {Qt Quick Templates 2 QML Types}{\c QtQuick.Templates} - \li \l {Qt Quick Calendar QML Types}{\c QtQuick.Calendar},\br - \l {Qt Labs Platform QML Types}{\c Qt.labs.platform} + \li \l {Qt Labs Platform QML Types}{\c Qt.labs.platform} \row \li 5.7 \li 2.7 @@ -127,6 +131,11 @@ \li 2.12 \li 2.12 \li 1.0 + \row + \li 6.0 + \li 6.0 + \li 6.0 + \li 1.0 \row \li ... \li ... -- cgit v1.2.3