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

Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/dbus/qdbusconnection_p.h
	src/dbus/qdbusintegrator.cpp
	src/dbus/qdbusintegrator_p.h
	tests/auto/corelib/io/qdir/qdir.pro
	tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp

Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp
index 80b6304049..dba920d1f7 100644
--- a/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp
+++ b/tests/auto/corelib/io/qabstractfileengine/tst_qabstractfileengine.cpp
@@ -47,6 +47,7 @@ class tst_QAbstractFileEngine
 {
     Q_OBJECT
 public slots:
+    void initTestCase();
     void cleanupTestCase();
 
 private slots:
@@ -59,6 +60,8 @@ private slots:
     void mounting();
 private:
     QStringList filesForRemoval;
+    QSharedPointer<QTemporaryDir> m_currentDir;
+    QString m_previousCurrent;
 };
 
 class ReferenceFileEngine
@@ -558,6 +561,14 @@ class FileEngineHandler
     }
 };
 
+void tst_QAbstractFileEngine::initTestCase()
+{
+    m_previousCurrent = QDir::currentPath();
+    m_currentDir = QSharedPointer<QTemporaryDir>(new QTemporaryDir());
+    QVERIFY2(!m_currentDir.isNull(), qPrintable("Could not create current directory."));
+    QDir::setCurrent(m_currentDir->path());
+}
+
 void tst_QAbstractFileEngine::cleanupTestCase()
 {
     bool failed = false;
@@ -571,6 +582,8 @@ void tst_QAbstractFileEngine::cleanupTestCase()
         }
 
     QVERIFY(!failed);
+
+    QDir::setCurrent(m_previousCurrent);
 }
 
 void tst_QAbstractFileEngine::customHandler()