aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-06-17 15:42:05 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-06-24 18:26:14 +0200
commit36df81b3bc6d721d5598d5163b0a9659de4a69ee (patch)
treed9032e08f4d27daa9e4b16a2c2e622ed2fa6951b /src/qml/doc/src
parent6de0287d7c3aa4251fe6eb4f970d73ce11cf07fc (diff)
Discern between "auto" and versioned imports in qmldirs
You can now import the latest version, a specific version, or, "auto" which is the same version as the parent module. [ChangeLog][QtQml] You can now procedurally add module imports to modules, using qmlRegisterModuleImport(). However, actual import statements in qmldir files should be preferred wherever possible. Fixes: QTBUG-84899 Change-Id: I3b32dd8b07a19d31b6538b9a6bb436840862f345 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/doc/src')
-rw-r--r--src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc
index e9dc5a043a..0be46f30d2 100644
--- a/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc
+++ b/src/qml/doc/src/qmllanguageref/modules/qmldir.qdoc
@@ -246,6 +246,23 @@ depends MyOtherModule 1.0
load QML (perhaps conditionally) which then depends on other
modules. In such cases, the \c depends declaration is necessary
to include the other modules in application packages.
+ \row
+ \li
+ \code
+import <ModuleIdentifier> [<Version>]
+ \endcode
+ \li Declares that this module imports another.
+
+ Example:
+ \code
+import MyOtherModule 1.0
+ \endcode
+
+ The types from the other module are made available in the same type
+ namespace as this module is imported into. Omitting the version
+ imports the latest version available of the other module, specifying
+ \c auto as version imports the same version as the version of this
+ module specified in the QML \c import statement.
\row
\li