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-26 18:48:47 +0000 |
commit | 0f0d39c708f5be77a4a9cf9491e64c8a42770c4c (patch) | |
tree | 9c818e36fab45678068ef2e415feac98849c4a20 /src/imports | |
parent | a5d2a7a2c8698f2848d54207957e2b059683048d (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
Change-Id: I3ac44f93aab3086c1a49de79ecc677beb4ef9180
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 72746ef0ad69d589de91f43aa2043d6e47745d68)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 6 | ||||
-rw-r--r-- | src/imports/labsmodels/qqmldelegatecomponent.cpp | 8 | ||||
-rw-r--r-- | src/imports/localstorage/qquicklocalstorage.cpp | 4 | ||||
-rw-r--r-- | src/imports/models/plugin.cpp | 2 | ||||
-rw-r--r-- | src/imports/qtqml/plugin.cpp | 2 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/qwavefrontmesh.cpp | 2 | ||||
-rw-r--r-- | src/imports/workerscript/plugin.cpp | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp index 342fc77aaa..bf2725274d 100644 --- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp @@ -224,7 +224,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) To use this module, import the module with the following line: - \qml \QtMinorVersion + \qml import Qt.labs.folderlistmodel \endqml */ @@ -244,7 +244,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) \e{Elements in the Qt.labs module are not guaranteed to remain compatible in future versions.} - \qml \QtMinorVersion + \qml import Qt.labs.folderlistmodel \endqml @@ -291,7 +291,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path) The following example shows a FolderListModel being used to provide a list of QML files in a \l ListView: - \qml \QtMinorVersion + \qml import QtQuick import Qt.labs.folderlistmodel diff --git a/src/imports/labsmodels/qqmldelegatecomponent.cpp b/src/imports/labsmodels/qqmldelegatecomponent.cpp index 2de6b55045..dc644d3095 100644 --- a/src/imports/labsmodels/qqmldelegatecomponent.cpp +++ b/src/imports/labsmodels/qqmldelegatecomponent.cpp @@ -180,10 +180,10 @@ bool QQmlDelegateChoice::match(int row, int column, const QVariant &value) const sliders, radio buttons, and other visualizations based on the type of each setting. In this case, DelegateChooser could provide an easy way to associate a different type of delegate with each setting: - \qml \QtMinorVersion - import QtQuick 2.\1 - import QtQuick.Controls 2.\1 - import Qt.labs.qmlmodels 1.0 + \qml + import QtQuick + import QtQuick.Controls + import Qt.labs.qmlmodels ListView { width: 200; height: 400 diff --git a/src/imports/localstorage/qquicklocalstorage.cpp b/src/imports/localstorage/qquicklocalstorage.cpp index 0a66126fa9..4f74c9bd95 100644 --- a/src/imports/localstorage/qquicklocalstorage.cpp +++ b/src/imports/localstorage/qquicklocalstorage.cpp @@ -545,7 +545,7 @@ through the data. To use the types in this module, import the module and call the relevant functions using the \c LocalStorage type: - \qml \QtMinorVersion + \qml import QtQuick import QtQuick.LocalStorage @@ -575,7 +575,7 @@ using the Offline Storage API. \section3 Open or Create a Database -\qml \QtMinorVersion +\qml import QtQuick.LocalStorage as Sql db = Sql.openDatabaseSync(identifier, version, description, estimated_size, callback(db)) diff --git a/src/imports/models/plugin.cpp b/src/imports/models/plugin.cpp index 9a25fd3ad1..7547acb253 100644 --- a/src/imports/models/plugin.cpp +++ b/src/imports/models/plugin.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE To use the types in this module, import the module with the following line: - \qml \QtMinorVersion + \qml import QtQml.Models \endqml diff --git a/src/imports/qtqml/plugin.cpp b/src/imports/qtqml/plugin.cpp index 5b9dcd9ec9..31a40bbe4c 100644 --- a/src/imports/qtqml/plugin.cpp +++ b/src/imports/qtqml/plugin.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE To use the types in this module, import the module with the following line: - \qml \QtMinorVersion + \qml import QtQml \endqml */ diff --git a/src/imports/wavefrontmesh/qwavefrontmesh.cpp b/src/imports/wavefrontmesh/qwavefrontmesh.cpp index 4523e30790..6be5c3d73f 100644 --- a/src/imports/wavefrontmesh/qwavefrontmesh.cpp +++ b/src/imports/wavefrontmesh/qwavefrontmesh.cpp @@ -91,7 +91,7 @@ public: To use this module, import the module with the following line: - \qml \QtMinorVersion + \qml import Qt.labs.wavefrontmesh \endqml */ diff --git a/src/imports/workerscript/plugin.cpp b/src/imports/workerscript/plugin.cpp index 28577d9768..55b88cb9b7 100644 --- a/src/imports/workerscript/plugin.cpp +++ b/src/imports/workerscript/plugin.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE To use the types in this module, import the module with the following line: - \qml \QtMinorVersion + \qml import QtQml.WorkerScript \endqml */ |