Merge remote-tracking branch 'origin/dev' into wip/new-backend

 Conflicts:
	src/qml/compiler/qv4isel_moth.cpp
	src/qml/compiler/qv4jsir.cpp
	src/qml/jsruntime/qv4mathobject.cpp

Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637

2 files changed, 6 insertions, 1 deletions

diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp
index f62f66170e..8cf0d2918e 100644
--- a/src/qmltest/quicktest.cpp
+++ b/src/qmltest/quicktest.cpp
@@ -277,6 +277,11 @@ int quick_test_main(int argc, char **argv, const char *name, const char *sourceD
     }
 #endif
 
+#ifdef Q_OS_ANDROID
+    if (testPath.isEmpty())
+        testPath = QLatin1String(":/");
+#endif
+
     // Determine where to look for the test data.
     if (testPath.isEmpty() && sourceDir) {
         const QString s = QString::fromLocal8Bit(sourceDir);
diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp
index dc7b917bc4..663d3c64e1 100644
--- a/src/qmltest/quicktestevent.cpp
+++ b/src/qmltest/quicktestevent.cpp
@@ -156,7 +156,7 @@ namespace QtQuickTest
             return;
         }
 
-        QPoint pos;
+        QPoint pos = _pos.toPoint();
         QQuickItem *sgitem = qobject_cast<QQuickItem *>(item);
         if (sgitem)
             pos = sgitem->mapToScene(_pos).toPoint();