Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	src/qml/jsruntime/qv4include.cpp
	src/quick/items/qquickrendercontrol.cpp
	src/quick/items/qquickrendercontrol_p.h
	src/quickwidgets/qquickwidget.cpp

Change-Id: Ib2dc0051a38cd283a37a7665eb4a76f6f7ec8b15

1 files changed, 16 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index b9576e1bee..ece0cfa8b3 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -209,20 +209,28 @@ QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx)
         result = i->result();
 
     } else {
+        QScopedPointer<QV4::Script> script;
 
-        QFile f(localFile);
+        if (const QQmlPrivate::CachedQmlUnit *cachedUnit = QQmlMetaType::findCachedCompilationUnit(url)) {
+            QV4::CompiledData::CompilationUnit *jsUnit = cachedUnit->createCompilationUnit();
+            script.reset(new QV4::Script(scope.engine, qmlcontextobject, jsUnit));
+        } else {
+            QFile f(localFile);
 
-        if (f.open(QIODevice::ReadOnly)) {
-            QByteArray data = f.readAll();
-            QString code = QString::fromUtf8(data);
-            QmlIR::Document::removeScriptPragmas(code);
+            if (f.open(QIODevice::ReadOnly)) {
+                QByteArray data = f.readAll();
+                QString code = QString::fromUtf8(data);
+                QmlIR::Document::removeScriptPragmas(code);
 
-            QV4::Script script(scope.engine, qmlcontextobject, code, url.toString());
+                script.reset(new QV4::Script(scope.engine, qmlcontextobject, code, url.toString()));
+            }
+        }
 
+        if (!script.isNull()) {
             QV4::ExecutionContext *ctx = scope.engine->currentContext();
-            script.parse();
+            script->parse();
             if (!scope.engine->hasException)
-                script.run();
+                script->run();
             if (scope.engine->hasException) {
                 QV4::ScopedValue ex(scope, ctx->catchException());
                 result = resultValue(scope.engine, Exception);