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

diff --cc src/qml/compiler/qqmltypecompiler.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4include.cpp
index b9576e1,2661ecc..ece0cfa
--- 1/src/qml/jsruntime/qv4include.cpp
--- 2/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@@ -209,29 -210,37 +209,37 @@@ QV4::ReturnedValue QV4Include::method_i
          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(v4, qmlcontextobject, jsUnit));
++            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(v4, qmlcontextobject, code, url.toString()));
++                script.reset(new QV4::Script(scope.engine, qmlcontextobject, code, url.toString()));
+             }
+         }
  
 -            QV4::ExecutionContext *ctx = v4->currentContext();
+         if (!script.isNull()) {
-             script.parse();
 +            QV4::ExecutionContext *ctx = scope.engine->currentContext();
 -            if (!v4->hasException)
+             script->parse();
-                 script.run();
 +            if (!scope.engine->hasException)
 -            if (v4->hasException) {
+                 script->run();
 +            if (scope.engine->hasException) {
                  QV4::ScopedValue ex(scope, ctx->catchException());
 -                result = resultValue(v4, Exception);
 -                result->asObject()->put(QV4::ScopedString(scope, v4->newString(QStringLiteral("exception"))), ex);
 +                result = resultValue(scope.engine, Exception);
 +                result->asObject()->put(scope.engine->newString(QStringLiteral("exception"))->getPointer(), ex);
              } else {
 -                result = resultValue(v4, Ok);
 +                result = resultValue(scope.engine, Ok);
              }
          } else {
 -            result = resultValue(v4, NetworkError);
 +            result = resultValue(scope.engine, NetworkError);
          }
  
          callback(callbackFunction, result);

diff --cc src/qml/qml/qqmlcomponent.cpp
Simple merge

diff --cc src/qml/qml/qqmlincubator.cpp
index 0665a4a,098a664..c342d8b
--- 1/src/qml/qml/qqmlincubator.cpp
--- 2/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@@ -292,12 -292,9 +292,9 @@@ void QQmlIncubatorPrivate::incubate(QQm
      QQmlEngine *engine = compiledData->engine;
      QQmlEnginePrivate *enginePriv = QQmlEnginePrivate::get(engine);
  
-     bool guardOk = vmeGuard.isOK();
-     vmeGuard.clear();
- 
-     if (!guardOk) {
+     if (!vmeGuard.isOK()) {
          QQmlError error;
 -        error.setUrl(compiledData->url);
 +        error.setUrl(compiledData->url());
          error.setDescription(QQmlComponent::tr("Object destroyed during incubation"));
          errors << error;
          progress = QQmlIncubatorPrivate::Completed;

diff --cc src/quick/items/qquickframebufferobject.cpp
Simple merge

diff --cc src/quick/items/qquickpathview.cpp
Simple merge

diff --cc src/quick/util/qquickanimatorjob.cpp
Simple merge

diff --cc tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Simple merge

diff --cc tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Simple merge