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

Conflicts:
	src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp

Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9

3 files changed, 38 insertions, 14 deletions

diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 66af37c40c..1c94fddecf 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -491,10 +491,11 @@ QUrl QQuickFolderListModel::parentFolder() const
             return QUrl();
         localFile = dir.path();
     } else {
-        const int pos = d->currentDir.path().lastIndexOf(QLatin1Char('/'));
+        const QString path = d->currentDir.path();
+        const int pos = path.lastIndexOf(QLatin1Char('/'));
         if (pos <= 0)
             return QUrl();
-        localFile = d->currentDir.path().left(pos);
+        localFile = path.left(pos);
     }
     return QUrl::fromLocalFile(localFile);
 }
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 3fd36f3f0d..a619030100 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -270,6 +270,15 @@ static ReturnedValue qmlsqldatabase_rows_item(CallContext *ctx)
     return qmlsqldatabase_rows_index(r, scope.engine, ctx->argc() ? ctx->args()[0].toUInt32() : 0);
 }
 
+static QVariant toSqlVariant(QV4::ExecutionEngine *engine, const QV4::ScopedValue &value)
+{
+    // toVariant() maps a null JS value to QVariant(VoidStar), but the SQL module
+    // expects a null variant. (this is because of QTBUG-40880)
+    if (value->isNull())
+        return QVariant();
+    return engine->toVariant(value, /*typehint*/-1);
+}
+
 static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
 {
     QV4::Scope scope(ctx);
@@ -300,8 +309,9 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
                 ScopedArrayObject array(scope, values);
                 quint32 size = array->getLength();
                 QV4::ScopedValue v(scope);
-                for (quint32 ii = 0; ii < size; ++ii)
-                    query.bindValue(ii, scope.engine->toVariant((v = array->getIndexed(ii)), -1));
+                for (quint32 ii = 0; ii < size; ++ii) {
+                    query.bindValue(ii, toSqlVariant(scope.engine, (v = array->getIndexed(ii))));
+                }
             } else if (values->as<Object>()) {
                 ScopedObject object(scope, values);
                 ObjectIterator it(scope, object, ObjectIterator::WithProtoChain|ObjectIterator::EnumerableOnly);
@@ -311,7 +321,7 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
                     key = it.nextPropertyName(val);
                     if (key->isNull())
                         break;
-                    QVariant v = scope.engine->toVariant(val, -1);
+                    QVariant v = toSqlVariant(scope.engine, val);
                     if (key->isString()) {
                         query.bindValue(key->stringValue()->toQString(), v);
                     } else {
@@ -320,7 +330,7 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
                     }
                 }
             } else {
-                query.bindValue(0, scope.engine->toVariant(values, -1));
+                query.bindValue(0, toSqlVariant(scope.engine, values));
             }
         }
         if (query.exec()) {
diff --git a/src/imports/statemachine/signaltransition.cpp b/src/imports/statemachine/signaltransition.cpp
index 127494d8d3..2e6381fc08 100644
--- a/src/imports/statemachine/signaltransition.cpp
+++ b/src/imports/statemachine/signaltransition.cpp
@@ -78,8 +78,9 @@ bool SignalTransition::eventTest(QEvent *event)
     // Set arguments as context properties
     int count = e->arguments().count();
     QMetaMethod metaMethod = e->sender()->metaObject()->method(e->signalIndex());
+    const auto parameterNames = metaMethod.parameterNames();
     for (int i = 0; i < count; i++)
-        context.setContextProperty(metaMethod.parameterNames()[i], QVariant::fromValue(e->arguments().at(i)));
+        context.setContextProperty(parameterNames[i], QVariant::fromValue(e->arguments().at(i)));
 
     QQmlExpression expr(m_guard, &context, this);
     QVariant result = expr.evaluate();
@@ -111,15 +112,27 @@ void SignalTransition::setSignal(const QJSValue &signal)
     QV4::ExecutionEngine *jsEngine = QV8Engine::getV4(QQmlEngine::contextForObject(this)->engine());
     QV4::Scope scope(jsEngine);
 
-    QV4::Scoped<QV4::QObjectMethod> qobjectSignal(scope, QJSValuePrivate::convertedToValue(jsEngine, m_signal));
-    Q_ASSERT(qobjectSignal);
-
-    QObject *sender = qobjectSignal->object();
-    Q_ASSERT(sender);
-    QMetaMethod metaMethod = sender->metaObject()->method(qobjectSignal->methodIndex());
+    QObject *sender;
+    QMetaMethod signalMethod;
+
+    QV4::ScopedValue value(scope, QJSValuePrivate::convertedToValue(jsEngine, m_signal));
+
+    // Did we get the "slot" that can be used to invoke the signal?
+    if (QV4::QObjectMethod *signalSlot = value->as<QV4::QObjectMethod>()) {
+        sender = signalSlot->object();
+        Q_ASSERT(sender);
+        signalMethod = sender->metaObject()->method(signalSlot->methodIndex());
+    } else if (QV4::QmlSignalHandler *signalObject = value->as<QV4::QmlSignalHandler>()) { // or did we get the signal object (the one with the connect()/disconnect() functions) ?
+        sender = signalObject->object();
+        Q_ASSERT(sender);
+        signalMethod = sender->metaObject()->method(signalObject->signalIndex());
+    } else {
+        qmlInfo(this) << tr("Specified signal does not exist.");
+        return;
+    }
 
     QSignalTransition::setSenderObject(sender);
-    QSignalTransition::setSignal(metaMethod.methodSignature());
+    QSignalTransition::setSignal(signalMethod.methodSignature());
 
     connectTriggered();
 }