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

Conflicts:
	src/corelib/kernel/qcoreapplication.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/network/bearer/qnetworkconfiguration.cpp
	src/plugins/bearer/blackberry/qbbengine.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
	src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
	src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
	src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
	src/plugins/platforms/qnx/qqnxwindow.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qwindowsvistastyle.cpp
	src/widgets/styles/qwindowsxpstyle.cpp
	src/widgets/widgets/qtoolbararealayout.cpp
	tests/auto/corelib/global/qflags/qflags.pro
	tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp

Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4

1 files changed, 17 insertions, 26 deletions

diff --git a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
index e47b2e2e69..24765a82a8 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
@@ -78,6 +78,9 @@ public:
     QList<test> tests;
 
     static void setupDatabase();
+
+private:
+    QScopedPointer<QTemporaryDir> m_dirModelTempDir;
 };
 
 
@@ -306,18 +309,20 @@ QModelIndex ModelsToTest::populateTestArea(QAbstractItemModel *model)
     }
 
     if (QDirModel *dirModel = qobject_cast<QDirModel *>(model)) {
-        if (!QDir::current().mkdir("test"))
-            qFatal("%s: cannot create directory %s",
-                   Q_FUNC_INFO,
-                   qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test")));
+        m_dirModelTempDir.reset(new QTemporaryDir);
+        if (!m_dirModelTempDir->isValid())
+            qFatal("Cannot create temporary directory \"%s\": %s",
+                   qPrintable(QDir::toNativeSeparators(m_dirModelTempDir->path())),
+                   qPrintable(m_dirModelTempDir->errorString()));
+
+        QDir tempDir(m_dirModelTempDir->path());
         for (int i = 0; i < 26; ++i) {
-            QString subdir = QLatin1String("test/foo_") + QString::number(i);
-            if (!QDir::current().mkdir(subdir))
-                qFatal("%s: cannot create directory %s",
-                       Q_FUNC_INFO,
-                       qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir)));
+            const QString subdir = QLatin1String("foo_") + QString::number(i);
+            if (!tempDir.mkdir(subdir))
+                qFatal("Cannot create directory %s",
+                       qPrintable(QDir::toNativeSeparators(tempDir.path() + QLatin1Char('/') +subdir)));
         }
-        return dirModel->index(QDir::currentPath()+"/test");
+        return dirModel->index(tempDir.path());
     }
 
     if (QSqlQueryModel *queryModel = qobject_cast<QSqlQueryModel *>(model)) {
@@ -383,22 +388,8 @@ QModelIndex ModelsToTest::populateTestArea(QAbstractItemModel *model)
  */
 void ModelsToTest::cleanupTestArea(QAbstractItemModel *model)
 {
-    if (qobject_cast<QDirModel *>(model))
-    {
-        if (QDir(QDir::currentPath()+"/test").exists())
-        {
-            for (int i = 0; i < 26; ++i) {
-                QString subdir(QLatin1String("test/foo_") + QString::number(i));
-                if (!QDir::current().rmdir(subdir))
-                    qFatal("%s: cannot remove directory %s",
-                           Q_FUNC_INFO,
-                           qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/"+subdir)));
-            }
-            if (!QDir::current().rmdir("test"))
-                qFatal("%s: cannot remove directory %s",
-                       Q_FUNC_INFO,
-                       qPrintable(QDir::toNativeSeparators(QDir::currentPath()+"/test")));
-        }
+    if (qobject_cast<QDirModel *>(model)) {
+        m_dirModelTempDir.reset();
     } else if (qobject_cast<QSqlQueryModel *>(model)) {
         QSqlQuery q("DROP TABLE test");
     }