aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@qt.io>2020-11-20 14:30:21 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-24 23:59:49 +0000
commit3fa42288182c3461cf7d5f629d789fa8b6aaa4cb (patch)
tree19ffea7c8180a92065183803a4f690b21583df40 /src/imports
parentb3848de6945d8514b6bea0909659310cbe38af61 (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/imports')
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.cpp8
-rw-r--r--src/imports/labsanimation/plugin.cpp2
-rw-r--r--src/imports/labsmodels/plugin.cpp2
-rw-r--r--src/imports/localstorage/qquicklocalstorage.cpp6
-rw-r--r--src/imports/models/plugin.cpp4
-rw-r--r--src/imports/qtqml/plugin.cpp2
-rw-r--r--src/imports/settings/qqmlsettings.cpp10
-rw-r--r--src/imports/sharedimage/plugin.cpp2
-rw-r--r--src/imports/wavefrontmesh/qwavefrontmesh.cpp2
-rw-r--r--src/imports/workerscript/plugin.cpp2
10 files changed, 20 insertions, 20 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 44f0a49d76..342fc77aaa 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -225,7 +225,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path)
To use this module, import the module with the following line:
\qml \QtMinorVersion
- import Qt.labs.folderlistmodel 2.\1
+ import Qt.labs.folderlistmodel
\endqml
*/
@@ -245,7 +245,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path)
in future versions.}
\qml \QtMinorVersion
- import Qt.labs.folderlistmodel 2.\1
+ import Qt.labs.folderlistmodel
\endqml
The \l folder property specifies the folder to access. Information about the
@@ -292,8 +292,8 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path)
of QML files in a \l ListView:
\qml \QtMinorVersion
- import QtQuick 2.\1
- import Qt.labs.folderlistmodel 2.\1
+ import QtQuick
+ import Qt.labs.folderlistmodel
ListView {
width: 200; height: 400
diff --git a/src/imports/labsanimation/plugin.cpp b/src/imports/labsanimation/plugin.cpp
index 9c985f0dcf..ea1c03a56f 100644
--- a/src/imports/labsanimation/plugin.cpp
+++ b/src/imports/labsanimation/plugin.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
To use the types in this module, import the module with the following line:
\code
- import Qt.labs.animation 1.0
+ import Qt.labs.animation
\endcode
*/
diff --git a/src/imports/labsmodels/plugin.cpp b/src/imports/labsmodels/plugin.cpp
index ab5e0023a6..be26e5c8da 100644
--- a/src/imports/labsmodels/plugin.cpp
+++ b/src/imports/labsmodels/plugin.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
To use the types in this module, import the module with the following line:
\code
- import Qt.labs.qmlmodels 1.0
+ import Qt.labs.qmlmodels
\endcode
*/
diff --git a/src/imports/localstorage/qquicklocalstorage.cpp b/src/imports/localstorage/qquicklocalstorage.cpp
index 62f19eed63..0a66126fa9 100644
--- a/src/imports/localstorage/qquicklocalstorage.cpp
+++ b/src/imports/localstorage/qquicklocalstorage.cpp
@@ -546,8 +546,8 @@ through the data.
relevant functions using the \c LocalStorage type:
\qml \QtMinorVersion
- import QtQuick 2.\1
- import QtQuick.LocalStorage 2.\1
+ import QtQuick
+ import QtQuick.LocalStorage
Item {
Component.onCompleted: {
@@ -576,7 +576,7 @@ using the Offline Storage API.
\section3 Open or Create a Database
\qml \QtMinorVersion
-import QtQuick.LocalStorage 2.\1 as Sql
+import QtQuick.LocalStorage as Sql
db = Sql.openDatabaseSync(identifier, version, description, estimated_size, callback(db))
\endqml
diff --git a/src/imports/models/plugin.cpp b/src/imports/models/plugin.cpp
index c15866cf05..9a25fd3ad1 100644
--- a/src/imports/models/plugin.cpp
+++ b/src/imports/models/plugin.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
To use the types in this module, import the module with the following line:
\qml \QtMinorVersion
- import QtQml.Models 2.\1
+ import QtQml.Models
\endqml
\note QtQml.Models module started at version 2.1 to match the version
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
To use these experimental types, import the module with the following line:
\qml
- import Qt.labs.qmlmodels 1.0
+ import Qt.labs.qmlmodels
\endqml
\section1 QML Types
diff --git a/src/imports/qtqml/plugin.cpp b/src/imports/qtqml/plugin.cpp
index a32d86eeb1..5b9dcd9ec9 100644
--- a/src/imports/qtqml/plugin.cpp
+++ b/src/imports/qtqml/plugin.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
To use the types in this module, import the module with the following line:
\qml \QtMinorVersion
- import QtQml 2.\1
+ import QtQml
\endqml
*/
diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp
index 50308b30a9..ff8ec5e065 100644
--- a/src/imports/settings/qqmlsettings.cpp
+++ b/src/imports/settings/qqmlsettings.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
To use this module, import the module with the following line:
\code
- import Qt.labs.settings 1.0
+ import Qt.labs.settings
\endcode
*/
@@ -87,8 +87,8 @@ QT_BEGIN_NAMESPACE
how to use Settings to store and restore the geometry of a window.
\qml
- import QtQuick.Window 2.1
- import Qt.labs.settings 1.0
+ import QtQuick.Window
+ import Qt.labs.settings
Window {
id: window
@@ -119,8 +119,8 @@ QT_BEGIN_NAMESPACE
a setting on component destruction.
\qml
- import QtQuick 2.1
- import Qt.labs.settings 1.0
+ import QtQuick
+ import Qt.labs.settings
Item {
id: page
diff --git a/src/imports/sharedimage/plugin.cpp b/src/imports/sharedimage/plugin.cpp
index d7c2ef8d17..3245635b2d 100644
--- a/src/imports/sharedimage/plugin.cpp
+++ b/src/imports/sharedimage/plugin.cpp
@@ -62,7 +62,7 @@
To use this module, import it like this:
\code
- import Qt.labs.sharedimage 1.0
+ import Qt.labs.sharedimage
\endcode
The sharing functionality is provided through a QQuickImageProvider. Use
diff --git a/src/imports/wavefrontmesh/qwavefrontmesh.cpp b/src/imports/wavefrontmesh/qwavefrontmesh.cpp
index 36cc4d4079..4523e30790 100644
--- a/src/imports/wavefrontmesh/qwavefrontmesh.cpp
+++ b/src/imports/wavefrontmesh/qwavefrontmesh.cpp
@@ -92,7 +92,7 @@ public:
To use this module, import the module with the following line:
\qml \QtMinorVersion
- import Qt.labs.wavefrontmesh 1.\1
+ import Qt.labs.wavefrontmesh
\endqml
*/
diff --git a/src/imports/workerscript/plugin.cpp b/src/imports/workerscript/plugin.cpp
index 1323b17ef4..28577d9768 100644
--- a/src/imports/workerscript/plugin.cpp
+++ b/src/imports/workerscript/plugin.cpp
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
To use the types in this module, import the module with the following line:
\qml \QtMinorVersion
- import QtQml.WorkerScript 2.\1
+ import QtQml.WorkerScript
\endqml
*/