Script dependency handling cleanup

The code for setting up CompiledData::m_dependentScripts is independent
from the QML type compiler and can be moved into the type loader. This
will also allow for re-use when using disk backed compilation units.

Change-Id: I56ce5674c50dcca8fda294556a3fd31e073cf24d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 21 insertions, 1 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 56dc4694e0..0ba0384c60 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -2102,7 +2102,27 @@ void QQmlTypeData::done()
         }
     }
 
-    if (isError()) {
+    if (!isError()) {
+        // Collect imported scripts
+        m_compiledData->dependentScripts.reserve(m_scripts.count());
+        for (int scriptIndex = 0; scriptIndex < m_scripts.count(); ++scriptIndex) {
+            const QQmlTypeData::ScriptReference &script = m_scripts.at(scriptIndex);
+
+            QStringRef qualifier(&script.qualifier);
+            QString enclosingNamespace;
+
+            const int lastDotIndex = qualifier.lastIndexOf(QLatin1Char('.'));
+            if (lastDotIndex != -1) {
+                enclosingNamespace = qualifier.left(lastDotIndex).toString();
+                qualifier = qualifier.mid(lastDotIndex+1);
+            }
+
+            m_compiledData->importCache->add(qualifier.toString(), scriptIndex, enclosingNamespace);
+            QQmlScriptData *scriptData = script.script->scriptData();
+            scriptData->addref();
+            m_compiledData->dependentScripts << scriptData;
+        }
+    } else {
         m_compiledData = nullptr;
     }