diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-01 11:30:00 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-01 11:30:00 +1000 |
| commit | d09d7aec4c3f4db0c4d6a09c33aff863551a8369 (patch) | |
| tree | c6252697e54e186f075e9ae7b3d55fb10382648a /src/declarative/qml/qdeclarativevme.cpp | |
| parent | e2c67953cea0ba8ceec880d124c9e9c97ec55207 (diff) | |
| parent | 3296449d5cd9491b56914a23a78d2f78982a6856 (diff) | |
Merge branch 'master' into v8-clean
Conflicts:
src/declarative/qml/qdeclarativevme.cpp
Change-Id: I0bbc12c06d40c70433730cb33c4e9b461520263f
Diffstat (limited to 'src/declarative/qml/qdeclarativevme.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index 95a8ca0cb9..96b71acf76 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -1025,6 +1025,9 @@ v8::Persistent<v8::Object> QDeclarativeVME::run(QDeclarativeContextData *parentC ctxt->imports = script->importCache; } else if (effectiveCtxt) { ctxt->imports = effectiveCtxt->imports; + ctxt->importedScripts = effectiveCtxt->importedScripts; + for (int ii = 0; ii < ctxt->importedScripts.count(); ++ii) + ctxt->importedScripts[ii] = qPersistentNew<v8::Object>(ctxt->importedScripts[ii]); } if (ctxt->imports) { |