summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-05-26 04:47:11 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-05-26 07:29:29 (GMT)
commitdc9602f6bb805751beb3b7963398679d12753e53 (patch)
treef9827376ec7f8c971795f5822a59d8ce0d7e0653 /src/declarative/qml
parentb930d1a26b0c5999c205f224d75d7de6fa40699c (diff)
downloadQt-dc9602f6bb805751beb3b7963398679d12753e53.zip
Qt-dc9602f6bb805751beb3b7963398679d12753e53.tar.gz
Qt-dc9602f6bb805751beb3b7963398679d12753e53.tar.bz2
Allow js files with '.pragma library' to be used from WorkerScript
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativeworkerscript.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index 1550351..2ca030e 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -295,6 +295,7 @@ void QDeclarativeWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
ctxt->pushScope(urlContext);
ctxt->pushScope(activation);
ctxt->setActivationObject(activation);
+ QDeclarativeScriptParser::extractPragmas(script);
workerEngine->baseUrl = url;
workerEngine->evaluate(script);