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

Conflicts:
	src/widgets/widgets/qmenu.cpp

Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
index 757e4d16e4..16215714f3 100644
--- a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
@@ -699,9 +699,11 @@ void tst_QPainterPath::testOperatorDatastream()
     path.addRect(0, 0, 100, 100);
     path.setFillRule(Qt::WindingFill);
 
+    QTemporaryDir tempDir(QDir::tempPath() + "/tst_qpainterpath.XXXXXX");
+    QVERIFY2(tempDir.isValid(), qPrintable(tempDir.errorString()));
     // Write out
     {
-        QFile data("data");
+        QFile data(tempDir.path() + "/data");
         bool ok = data.open(QFile::WriteOnly);
         QVERIFY(ok);
         QDataStream stream(&data);
@@ -711,7 +713,7 @@ void tst_QPainterPath::testOperatorDatastream()
     QPainterPath other;
     // Read in
     {
-        QFile data("data");
+        QFile data(tempDir.path() + "/data");
         bool ok = data.open(QFile::ReadOnly);
         QVERIFY(ok);
         QDataStream stream(&data);