diff options
| author | Jerome Pasion <jerome.pasion@qt.io> | 2020-11-20 14:30:21 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@qt.io> | 2020-11-26 17:53:19 +0100 |
| commit | 72746ef0ad69d589de91f43aa2043d6e47745d68 (patch) | |
| tree | 4b4d187517ff09e819bdd6a1e74c70b9bd4b89a1 /src/quick/doc | |
| parent | f3ff873f67474d30cc04fb7b7a35e78d1c8922e3 (diff) | |
Doc: Remove version numbers for import statement
-recommend using the import statement without versions for Qt 6.0
-update use of \qml snippet without \QtMinorVersion
-some language change to be neutral about versions
Task-number: QTBUG-87155
Pick-to: 6.0 6.0.0
Change-Id: I3ac44f93aab3086c1a49de79ecc677beb4ef9180
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/quick/doc')
| -rw-r--r-- | src/quick/doc/src/concepts/effects/particles.qdoc | 6 | ||||
| -rw-r--r-- | src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc | 12 | ||||
| -rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 5 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/quick/doc/src/concepts/effects/particles.qdoc b/src/quick/doc/src/concepts/effects/particles.qdoc index d0d86e9167..20c721a0cd 100644 --- a/src/quick/doc/src/concepts/effects/particles.qdoc +++ b/src/quick/doc/src/concepts/effects/particles.qdoc @@ -33,7 +33,7 @@ This QML module contains a particle system for Qt Quick. To use these types, import the module with the following line: - \qml \QtMinorVersion + \qml import QtQuick.Particles \endqml @@ -51,8 +51,8 @@ To use the types from the particles module, import the module with the following line: - \qml \QtMinorVersion - import QtQuick.Particles 2.\1 + \qml + import QtQuick.Particles \endqml \section1 The ParticleSystem diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc index abfff7cc11..2c492cdca2 100644 --- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc +++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc @@ -197,9 +197,9 @@ so. To explain why, let's take a look at a simplified example. Suppose we were writing the UI for a settings page: -\qml \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 +\qml + import QtQuick + import QtQuick.Controls Page { Button { @@ -296,9 +296,9 @@ into QML: The QML then calls the C++ slot directly: -\qml \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 +\qml + import QtQuick + import QtQuick.Controls Page { Button { diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index 45677ce386..9d79ac862b 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -34,10 +34,9 @@ The \l{Qt Quick} module provides graphical primitive types. These types are only available in a QML document if that document imports the \c QtQuick namespace. -The current version of the \c QtQuick module is version \QtMinorVersion, and -thus it may be imported via the following statement: +To use the module, import the \c QtQuick module with the following statement: -\qml \QtMinorVersion +\qml import QtQuick \endqml |