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

Conflicts:
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro

Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index fbd368d077..16ff118a3f 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -483,11 +483,11 @@ void tst_QFiledialog::completer()
 
     if (startPath.isEmpty()) {
         tempDir.reset(new QTemporaryDir);
-        QVERIFY(tempDir->isValid());
+        QVERIFY2(tempDir->isValid(), qPrintable(tempDir->errorString()));
         startPath = tempDir->path();
         for (int i = 0; i < 10; ++i) {
             TemporaryFilePtr file(new QTemporaryFile(startPath + QStringLiteral("/rXXXXXX")));
-            QVERIFY(file->open());
+            QVERIFY2(file->open(), qPrintable(file->errorString()));
             files.append(file);
         }
     }
@@ -889,7 +889,7 @@ void tst_QFiledialog::selectFile()
     QScopedPointer<QTemporaryFile> tempFile;
     if (file == QLatin1String("temp")) {
         tempFile.reset(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/aXXXXXX")));
-        QVERIFY(tempFile->open());
+        QVERIFY2(tempFile->open(), qPrintable(tempFile->errorString()));
         file = tempFile->fileName();
     }
 
@@ -927,7 +927,7 @@ void tst_QFiledialog::selectFileWrongCaseSaveAs()
 void tst_QFiledialog::selectFiles()
 {
     QTemporaryDir tempDir;
-    QVERIFY(tempDir.isValid());
+    QVERIFY2(tempDir.isValid(), qPrintable(tempDir.errorString()));
     const QString tempPath = tempDir.path();
     {
     QNonNativeFileDialog fd;