Merge branch 'wip/v4' of qtdeclarative into dev

Pull in the remaining bits of the new compiler/vme branch.

Change-Id: I4706011c5eaf35f893d0733c4e130a31ce0ebb66

1 files changed, 4 insertions, 7 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 842eb53a3b..1bd3ba25d5 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2182,9 +2182,8 @@ void QQmlTypeData::dataReceived(const Data &data)
     QList<QQmlError> errors;
 
     // ### convert to use new data structure once old compiler is gone.
-    QList<QQmlScript::Import> imports;
-    if (m_useNewCompiler) {
-        imports.reserve(parsedQML->imports.size());
+    if (m_useNewCompiler && m_newImports.isEmpty()) {
+        m_newImports.reserve(parsedQML->imports.size());
         foreach (QV4::CompiledData::Import *i, parsedQML->imports) {
             QQmlScript::Import import;
             import.uri = parsedQML->stringAt(i->uriIndex);
@@ -2202,13 +2201,11 @@ void QQmlTypeData::dataReceived(const Data &data)
             }
 
 
-            imports << import;
+            m_newImports << import;
         }
-    } else {
-        imports = scriptParser.imports();
     }
 
-    foreach (const QQmlScript::Import &import, imports) {
+    foreach (const QQmlScript::Import &import, m_useNewCompiler ? m_newImports : scriptParser.imports()) {
         if (!addImport(import, &errors)) {
             Q_ASSERT(errors.size());
             QQmlError error(errors.takeFirst());