diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-05-18 06:09:53 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-05-18 06:11:34 (GMT) |
| commit | ffccebed9af217cc5bf2f3e4eba00df754eb7ac9 (patch) | |
| tree | 79fb7c62e5e695d0d3c1a65932a4b91187e7c7f1 /src | |
| parent | 711a9a8294d354c1a745b0f6a550672403b7e6fd (diff) | |
| download | Qt-ffccebed9af217cc5bf2f3e4eba00df754eb7ac9.zip Qt-ffccebed9af217cc5bf2f3e4eba00df754eb7ac9.tar.gz Qt-ffccebed9af217cc5bf2f3e4eba00df754eb7ac9.tar.bz2 | |
Make Qt.include() work for js files that have '.pragma library'
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativeinclude.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeinclude.cpp b/src/declarative/qml/qdeclarativeinclude.cpp index 619264a..e37b68b 100644 --- a/src/declarative/qml/qdeclarativeinclude.cpp +++ b/src/declarative/qml/qdeclarativeinclude.cpp @@ -140,6 +140,7 @@ void QDeclarativeInclude::finished() scriptContext->pushScope(m_scope[1]); scriptContext->setActivationObject(m_scope[1]); + QDeclarativeScriptParser::extractPragmas(code); m_scriptEngine->evaluate(code, urlString, 1); @@ -230,6 +231,7 @@ QScriptValue QDeclarativeInclude::include(QScriptContext *ctxt, QScriptEngine *e QScriptValue scope = QScriptDeclarativeClass::scopeChainValue(ctxt, -5); scriptContext->pushScope(scope); scriptContext->setActivationObject(scope); + QDeclarativeScriptParser::extractPragmas(code); engine->evaluate(code, urlString, 1); @@ -291,6 +293,7 @@ QScriptValue QDeclarativeInclude::worker_include(QScriptContext *ctxt, QScriptEn QScriptValue scope = QScriptDeclarativeClass::scopeChainValue(ctxt, -4); scriptContext->pushScope(scope); scriptContext->setActivationObject(scope); + QDeclarativeScriptParser::extractPragmas(code); engine->evaluate(code, urlString, 1); |