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

Conflicts:
	src/corelib/global/qlogging.cpp

Change-Id: I9cc8f25ad897efab6a42cb5c5161b1c9402952f0

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index f46d58513e..b09a3447e3 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -1718,14 +1718,14 @@ void tst_QDom::germanUmlautToFile() const
 
     QDomDocument d("test");
     d.appendChild(d.createElement(name));
-    QFile file("germanUmlautToFile.xml");
-    QVERIFY(file.open(QIODevice::WriteOnly));
+    QTemporaryFile file;
+    QVERIFY(file.open());
     QTextStream ts(&file);
     ts.setCodec("UTF-8");
     ts << d.toString();
     file.close();
 
-    QFile inFile("germanUmlautToFile.xml");
+    QFile inFile(file.fileName());
     QVERIFY(inFile.open(QIODevice::ReadOnly));
 
     QString baseline(QLatin1String("<!DOCTYPE test>\n<german"));