Remove some duplicated code

We can centralize the code that initializes a V4::Script instance used
in worker scripts as well as in the Qt.include() function.

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

1 files changed, 1 insertions, 15 deletions

diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index e9d3d1c95d..d1ceb0a892 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -227,21 +227,7 @@ QV4::ReturnedValue QV4Include::method_include(const QV4::FunctionObject *b, cons
 
     } else {
         QScopedPointer<QV4::Script> script;
-
-        if (const QQmlPrivate::CachedQmlUnit *cachedUnit = QQmlMetaType::findCachedCompilationUnit(url)) {
-            QV4::CompiledData::CompilationUnit *jsUnit = cachedUnit->createCompilationUnit();
-            script.reset(new QV4::Script(scope.engine, qmlcontext, jsUnit));
-        } else {
-            QFile f(localFile);
-
-            if (f.open(QIODevice::ReadOnly)) {
-                QByteArray data = f.readAll();
-                QString code = QString::fromUtf8(data);
-                QmlIR::Document::removeScriptPragmas(code);
-
-                script.reset(new QV4::Script(scope.engine, qmlcontext, code, url.toString()));
-            }
-        }
+        script.reset(QV4::Script::createFromFileOrCache(scope.engine, qmlcontext, localFile, url));
 
         if (!script.isNull()) {
             script->parse();