Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	tests/auto/qml/qjsengine/tst_qjsengine.cpp

Change-Id: I25e264df273c01832f64dbd31923d8529f1d1900

1 files changed, 4 insertions, 2 deletions

diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp
index dbc2769dd1..634e2da1c9 100644
--- a/src/qml/types/qquickworkerscript.cpp
+++ b/src/qml/types/qquickworkerscript.cpp
@@ -400,9 +400,11 @@ void QQuickWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
     QV4::Scoped<QV4::QmlContext> qmlContext(scope, getWorker(script));
     Q_ASSERT(!!qmlContext);
 
-    program.reset(QV4::Script::createFromFileOrCache(v4, qmlContext, fileName, url));
+    QString error;
+    program.reset(QV4::Script::createFromFileOrCache(v4, qmlContext, fileName, url, &error));
     if (program.isNull()) {
-        qWarning().nospace() << "WorkerScript: Cannot find source file " << url.toString();
+        if (!error.isEmpty())
+            qWarning().nospace() << error;
         return;
     }