aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-10-10 13:59:00 +0200
committerLiang Qi <liang.qi@qt.io>2019-10-10 13:59:00 +0200
commitaa057451b35953018c4f94d0a4bd5e813767cbc9 (patch)
tree8fd40c6d230e7e6171bca10e58178744326d5a5d /src/qml/doc
parent3fde977a817498817e98ce350d493658b0ed4458 (diff)
parentb418c2fe6c97aa63e990ce5ee349aa33266b6579 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: src/plugins/scenegraph/openvg/qsgopenvgcontext.cpp tests/auto/quick/qquickpathview/tst_qquickpathview.cpp Change-Id: I117c8d62b21800329d1035021d312d9924f83a1b
Diffstat (limited to 'src/qml/doc')
-rw-r--r--src/qml/doc/src/javascript/imports.qdoc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc
index 974f2e154f..8e26c4aadd 100644
--- a/src/qml/doc/src/javascript/imports.qdoc
+++ b/src/qml/doc/src/javascript/imports.qdoc
@@ -144,14 +144,17 @@ A JavaScript resource may import a QML module in the following fashion:
.import TypeNamespace MajorVersion.MinorVersion as Qualifier
\endcode
-For example:
+Below you can see an example that also shows how to use the QML types from a
+module imported in javascript:
+
\code
.import Qt.test 1.0 as JsQtTest
+
+var importedEnumValue = JsQtTest.MyQmlObject.EnumValue3
\endcode
In particular, this may be useful in order to access functionality provided
via a singleton type; see qmlRegisterSingletonType() for more information.
\note The .import syntax doesn't work for scripts used in the \l {WorkerScript}
-
*/