Create a copy of the imported script array handles

This prevents the handles from being double Dispose()'d.
sailfishos · Jun 8, 2011 · 0ad1d42 · 0ad1d42
1 parent 8902609
commit 0ad1d42
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -889,8 +889,11 @@ QObject * QDeclarativeComponentPrivate::begin(QDeclarativeContextData *parentCon
     ctxt->imports = component->importCache;
 
     // Nested global imports
-    if (componentCreationContext && start != -1) 
+    if (componentCreationContext && start != -1) {
         ctxt->importedScripts = componentCreationContext->importedScripts;
+        for (int ii = 0; ii < ctxt->importedScripts.count(); ++ii)
+            ctxt->importedScripts[ii] = qPersistentNew<v8::Object>(ctxt->importedScripts[ii]);
+    }
 
     component->importCache->addref();
     ctxt->setParent(parentContext);