Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev

3 files changed, 27 insertions, 16 deletions

diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp
index a43562a7b8..d1a7aa9b6f 100644
--- a/src/qml/types/qqmlconnections.cpp
+++ b/src/qml/types/qqmlconnections.cpp
@@ -288,9 +288,17 @@ void QQmlConnections::connectSignals()
                 new QQmlBoundSignal(target, signalIndex, this, qmlEngine(this));
             signal->setEnabled(d->enabled);
 
-            QQmlBoundSignalExpression *expression = ctxtdata ?
-                new QQmlBoundSignalExpression(target, signalIndex,
-                                              ctxtdata, this, d->compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex]) : nullptr;
+            auto f = d->compilationUnit->runtimeFunctions[binding->value.compiledScriptIndex];
+
+            // If the function is marked as having a nested function, then the user wrote:
+            //   onSomeSignal: function() { /*....*/ }
+            // So take that nested function:
+            if (auto closure = f->nestedFunction())
+                f = closure;
+
+            QQmlBoundSignalExpression *expression =
+                    ctxtdata ? new QQmlBoundSignalExpression(target, signalIndex, ctxtdata, this, f)
+                             : nullptr;
             signal->takeExpression(expression);
             d->boundsignals += signal;
         } else {
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index d4fc02cd3e..c4e33d572d 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -2351,21 +2351,22 @@ void QQmlListModel::append(QQmlV4Function *args)
             QV4::ScopedObject argObject(scope);
 
             int objectArrayLength = objectArray->getLength();
+            if (objectArrayLength > 0) {
+                int index = count();
+                emitItemsAboutToBeInserted(index, objectArrayLength);
 
-            int index = count();
-            emitItemsAboutToBeInserted(index, objectArrayLength);
+                for (int i=0 ; i < objectArrayLength ; ++i) {
+                    argObject = objectArray->getIndexed(i);
 
-            for (int i=0 ; i < objectArrayLength ; ++i) {
-                argObject = objectArray->getIndexed(i);
-
-                if (m_dynamicRoles) {
-                    m_modelObjects.append(DynamicRoleModelNode::create(scope.engine->variantMapFromJS(argObject), this));
-                } else {
-                    m_listModel->append(argObject);
+                    if (m_dynamicRoles) {
+                        m_modelObjects.append(DynamicRoleModelNode::create(scope.engine->variantMapFromJS(argObject), this));
+                    } else {
+                        m_listModel->append(argObject);
+                    }
                 }
-            }
 
-            emitItemsInserted();
+                emitItemsInserted();
+            }
         } else if (argObject) {
             int index;
 
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;
     }