aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@digia.com>2012-11-20 15:32:37 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-21 09:26:27 +0100
commit3f86278a77cf4918a2698aae317a9766d9b63505 (patch)
treea09ebd29c78feab5af2203616acaa0c95bc530b0
parentdea27f3421e29a54add2fdab2424529f77535def (diff)
Document importing issues in worker script
Task-number: QTBUG-27454 Change-Id: Ia9f384ab92fe0c55d3299d32a3f7faba1446ce35 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
-rw-r--r--src/qml/doc/src/javascript/imports.qdoc1
-rw-r--r--src/qml/qml/qquickworkerscript.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/doc/src/javascript/imports.qdoc b/src/qml/doc/src/javascript/imports.qdoc
index eea286d4ae..8e19a9baed 100644
--- a/src/qml/doc/src/javascript/imports.qdoc
+++ b/src/qml/doc/src/javascript/imports.qdoc
@@ -117,6 +117,7 @@ For example:
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}
\section1 Including a JavaScript Resource from Another JavaScript Resource
diff --git a/src/qml/qml/qquickworkerscript.cpp b/src/qml/qml/qquickworkerscript.cpp
index 40f07bf9f4..2d5a071bd9 100644
--- a/src/qml/qml/qquickworkerscript.cpp
+++ b/src/qml/qml/qquickworkerscript.cpp
@@ -600,6 +600,8 @@ void QQuickWorkerScriptEngine::run()
Additionally, there are restrictions on the types of values that can be passed to and
from the worker script. See the sendMessage() documentation for details.
+ Worker script can not use \l {qtqml-javascript-imports.html}{.import} syntax.
+
\sa {declarative/threading/workerscript}{WorkerScript example},
{declarative/threading/threadedlistmodel}{Threaded ListModel example}
*/