Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

3 files changed, 25 insertions, 1 deletions

diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp
index 7338636784..5d911eec1e 100644
--- a/src/imports/folderlistmodel/fileinfothread.cpp
+++ b/src/imports/folderlistmodel/fileinfothread.cpp
@@ -66,7 +66,6 @@ FileInfoThread::FileInfoThread(QObject *parent)
     connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(dirChanged(QString)));
     connect(watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateFile(QString)));
 #endif // !QT_NO_FILESYSTEMWATCHER
-    start(LowPriority);
 }
 
 FileInfoThread::~FileInfoThread()
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 9b0571a402..66af37c40c 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -538,6 +538,7 @@ void QQuickFolderListModel::componentComplete()
     QString localPath = QQmlFile::urlToLocalFileOrQrc(d->currentDir);
     if (localPath.isEmpty() || !QDir(localPath).exists())
         setFolder(QUrl::fromLocalFile(QDir::currentPath()));
+    d->fileInfoThread.start(QThread::LowPriority);
 }
 
 /*!
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index 0f73d97c1b..046ce507d4 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -972,6 +972,9 @@ Item {
         \sa mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mousePress(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mousePress", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1003,6 +1006,9 @@ Item {
         \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseRelease(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseRelease", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1036,6 +1042,9 @@ Item {
         \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseWheel()
     */
     function mouseDrag(item, x, y, dx, dy, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseDrag", 1)
+
         if (item.x === undefined || item.y === undefined)
             return
         if (button === undefined)
@@ -1083,6 +1092,9 @@ Item {
         \sa mousePress(), mouseRelease(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseClick(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseClick", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1114,6 +1126,9 @@ Item {
         \sa mouseDoubleClickSequence(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseDoubleClick(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseDoubleClick", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1152,6 +1167,9 @@ Item {
         \sa mouseDoubleClick(), mousePress(), mouseRelease(), mouseClick(), mouseMove(), mouseDrag(), mouseWheel()
     */
     function mouseDoubleClickSequence(item, x, y, button, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseDoubleClickSequence", 1)
+
         if (button === undefined)
             button = Qt.LeftButton
         if (modifiers === undefined)
@@ -1181,6 +1199,9 @@ Item {
         \sa mousePress(), mouseRelease(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseDrag(), mouseWheel()
     */
     function mouseMove(item, x, y, delay, buttons) {
+        if (!item)
+            qtest_fail("No item given to mouseMove", 1)
+
         if (delay == undefined)
             delay = -1
         if (buttons == undefined)
@@ -1206,6 +1227,9 @@ Item {
         \sa mousePress(), mouseClick(), mouseDoubleClick(), mouseDoubleClickSequence(), mouseMove(), mouseRelease(), mouseDrag(), QWheelEvent::angleDelta()
     */
     function mouseWheel(item, x, y, xDelta, yDelta, buttons, modifiers, delay) {
+        if (!item)
+            qtest_fail("No item given to mouseWheel", 1)
+
         if (delay == undefined)
             delay = -1
         if (buttons == undefined)