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

Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 18649b3de5..574ad805ca 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -193,7 +193,7 @@ void tst_QImageReader::getSetCheck()
 }
 
 tst_QImageReader::tst_QImageReader() :
-    m_temporaryDir(QStringLiteral("tst_qimagereaderXXXXXX"))
+    m_temporaryDir(QDir::tempPath() + QStringLiteral("/tst_qimagereaderXXXXXX"))
 {
     m_temporaryDir.setAutoRemove(true);
 }
@@ -728,13 +728,15 @@ void tst_QImageReader::imageFormatBeforeRead()
 
     SKIP_IF_UNSUPPORTED(format);
 
-    QImageReader reader(fileName);
+    QImageReader reader(prefix + fileName);
+    QVERIFY(reader.canRead());
     if (reader.supportsOption(QImageIOHandler::ImageFormat)) {
         QImage::Format fileFormat = reader.imageFormat();
         QCOMPARE(fileFormat, imageFormat);
         QSize size = reader.size();
         QImage image(size, fileFormat);
         QVERIFY(reader.read(&image));
+        QEXPECT_FAIL("bmp-3", "Semi-transparent BMPs not predicted", Continue);
         QCOMPARE(image.format(), fileFormat);
     }
 }