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

Conflicts:
	configure
	mkspecs/features/create_cmake.prf

Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
index 8515f8a698..713d0c5c17 100644
--- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
+++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -279,17 +279,18 @@ void tst_QTemporaryDir::openOnRootDrives()
 void tst_QTemporaryDir::stressTest()
 {
     const int iterations = 1000;
+    QTemporaryDir rootDir;
+    QVERIFY(rootDir.isValid());
 
     QSet<QString> names;
+    const QString pattern = rootDir.path() + QStringLiteral("/XXXXXX");
     for (int i = 0; i < iterations; ++i) {
-        QTemporaryDir dir;
+        QTemporaryDir dir(pattern);
         dir.setAutoRemove(false);
-        QVERIFY2(dir.isValid(), qPrintable(QString::number(i)));
+        QVERIFY2(dir.isValid(), qPrintable(QString::fromLatin1("Failed to create #%1 under %2.").arg(i).arg(QDir::toNativeSeparators(pattern))));
         QVERIFY(!names.contains(dir.path()));
         names.insert(dir.path());
     }
-    for (QSet<QString>::const_iterator it = names.constBegin(); it != names.constEnd(); ++it)
-        QDir(*it).removeRecursively();
 }
 
 void tst_QTemporaryDir::rename()