diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-27 05:44:20 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-08-27 05:44:20 (GMT) |
commit | 7f69818e7dcd5b029010e5f930abed519956a8ff (patch) | |
tree | c2c915ed0b34a2e37afea0150314bdcfbbc3bfcc /src/declarative/qml/qdeclarativecompiler.cpp | |
parent | 8b7bc81738108d4a80bb07eaa9d6c366361ab297 (diff) | |
download | Qt-7f69818e7dcd5b029010e5f930abed519956a8ff.zip Qt-7f69818e7dcd5b029010e5f930abed519956a8ff.tar.gz Qt-7f69818e7dcd5b029010e5f930abed519956a8ff.tar.bz2 |
Cleanup
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 34d33bb..f044e1a 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -668,13 +668,14 @@ void QDeclarativeCompiler::compileTree(Object *tree) QString scriptCode = QString::fromUtf8(unit->scripts.at(ii).resource->data); Object::ScriptBlock::Pragmas pragmas = QDeclarativeScriptParser::extractPragmas(scriptCode); + Q_ASSERT(!importedScripts.contains(unit->scripts.at(ii).qualifier)); + if (!scriptCode.isEmpty()) { Object::ScriptBlock &scriptBlock = importedScripts[unit->scripts.at(ii).qualifier]; - scriptBlock.codes.append(scriptCode); - scriptBlock.lineNumbers.append(1); - scriptBlock.files.append(unit->scripts.at(ii).resource->url); - scriptBlock.pragmas.append(pragmas); + scriptBlock.code = scriptCode; + scriptBlock.file = unit->scripts.at(ii).resource->url; + scriptBlock.pragmas = pragmas; } } |