diff options
author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-08-28 13:12:53 +0200 |
---|---|---|
committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-09-05 09:43:16 +0200 |
commit | f7c3035fa1d965dceb36892122683a5ceb6cab89 (patch) | |
tree | 94365c55f8a3dd6590edcd3ac5ec7149cea12e3e /src/qml/jsruntime/qv4script.cpp | |
parent | 210475565969ca5381174016b47cd32ddc96eaed (diff) |
QML: parse .js files as JavaScript, not QML.
When importing a JS library into a QML file with the "import" keyword,
that JS file was parsed in QML mode, disallowing QML keywords like "as".
Task-number: QTBUG-40143
Change-Id: Ie98adceb27544732c2e96657d41170db36bff288
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 36f61a1df5..4d6e069d1f 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -349,7 +349,7 @@ QV4::CompiledData::CompilationUnit *Script::precompile(IR::Module *module, Compi QQmlJS::Engine ee; QQmlJS::Lexer lexer(&ee); - lexer.setCode(source, /*line*/1, /*qml mode*/true); + lexer.setCode(source, /*line*/1, /*qml mode*/false); QQmlJS::Parser parser(&ee); parser.parseProgram(); |