diff options
| author | Jerome Pasion <jerome.pasion@qt.io> | 2020-11-20 14:30:21 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-24 23:59:49 +0000 |
| commit | 3fa42288182c3461cf7d5f629d789fa8b6aaa4cb (patch) | |
| tree | 19ffea7c8180a92065183803a4f690b21583df40 /src/quick | |
| parent | b3848de6945d8514b6bea0909659310cbe38af61 (diff) | |
Doc: Remove version numbers for import statement
-recommend using the import statement without versions for Qt 6.0
-update use of \qml
Task-number: QTBUG-87155
Change-Id: I555d582a13006c5abb6dc1e0266d2987ba79c6d8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 370fe537badd2b98c2da7f8918a15411d5aa67ad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quick')
5 files changed, 16 insertions, 9 deletions
diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc index 1cee633b75..d0d86e9167 100644 --- a/src/quick/doc/src/concepts/effects/particles.qdoc +++ b/src/quick/doc/src/concepts/effects/particles.qdoc @@ -34,7 +34,7 @@ This QML module contains a particle system for Qt Quick. To use these types, import the module with the following line: \qml \QtMinorVersion - import QtQuick.Particles 2.\1 + import QtQuick.Particles \endqml For a simple overview of how the system can be used, see \l{Using the Qt Quick Particle System}. diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc index a45ed4b45c..15b8394ebf 100644 --- a/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc +++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts-index.qdoc @@ -35,10 +35,17 @@ them well suited for resizable user interfaces. Since layouts are items they can consequently be nested. - The module is new in Qt 5.1 and requires \l{Qt Quick} 2.1. - Visit the \l{Qt Quick Layouts Overview} page to get started. + \section1 Using the Module + + The QML types can be imported into your application by adding the following + import statement in your \c {.qml} file. + + \qml + import QtQuick.Layouts + \endqml + \section1 Licenses Qt Quick Layouts is available under commercial licenses from \l{The Qt Company}. diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc index a5f93b972a..369c2f4444 100644 --- a/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc +++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts-overview.qdoc @@ -37,9 +37,9 @@ The QML types can be imported into your application using the following import statement in your \c {.qml} file. - \code - import QtQuick.Layouts 1.11 - \endcode + \qml + import QtQuick.Layouts + \endqml \section1 Key Features diff --git a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc index c33fc0cfa3..9ea8759318 100644 --- a/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc +++ b/src/quick/doc/src/concepts/layouts/qtquicklayouts.qdoc @@ -39,8 +39,8 @@ The QML types can be imported into your application using the following import statement in your .qml file. - \qml \QtMinorVersion - import QtQuick.Layouts 1.\1 + \qml + import QtQuick.Layouts \endqml */ diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index af46c5dcc3..45677ce386 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -38,7 +38,7 @@ The current version of the \c QtQuick module is version \QtMinorVersion, and thus it may be imported via the following statement: \qml \QtMinorVersion -import QtQuick 2.\1 +import QtQuick \endqml Visit the \l {Qt Quick} module documentation for more |