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

Conflicts:
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro

Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e

2 files changed, 4 insertions, 5 deletions

diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 210939c7f0..1e7e858bed 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -5025,6 +5025,7 @@ void tst_QPainter::drawPolyline_data()
     QTest::newRow("basic") << (QVector<QPointF>() << QPointF(10, 10) << QPointF(20, 10) << QPointF(20, 20) << QPointF(10, 20));
     QTest::newRow("clipped") << (QVector<QPointF>() << QPoint(-10, 100) << QPoint(-1, 100) << QPoint(-1,  -2) << QPoint(100, -2) << QPoint(100, 40)); // QTBUG-31579
     QTest::newRow("shortsegment") << (QVector<QPointF>() << QPoint(20, 100) << QPoint(20, 99) << QPoint(21, 99) << QPoint(21, 104)); // QTBUG-42398
+    QTest::newRow("edge") << (QVector<QPointF>() << QPointF(4.5, 121.6) << QPointF(9.4, 150.9) << QPointF(14.2, 184.8) << QPointF(19.1, 130.4));
 }
 
 void tst_QPainter::drawPolyline()
@@ -5034,7 +5035,7 @@ void tst_QPainter::drawPolyline()
 
     for (int r = 0; r < 2; r++) {
         images[r] = QImage(150, 150, QImage::Format_ARGB32);
-        images[r].fill(Qt::transparent);
+        images[r].fill(Qt::white);
         QPainter p(images + r);
         QPen pen(Qt::red, 0, Qt::SolidLine, Qt::FlatCap);
         p.setPen(pen);
diff --git a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp
index 4bc31baba8..5eaee1192a 100644
--- a/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp
+++ b/tests/auto/gui/painting/qpdfwriter/tst_qpdfwriter.cpp
@@ -50,8 +50,7 @@ private slots:
 void tst_QPdfWriter::basics()
 {
     QTemporaryFile file;
-    if (!file.open())
-        QSKIP("Couldn't open temp file!");
+    QVERIFY2(file.open(), qPrintable(file.errorString()));
     QPdfWriter writer(file.fileName());
 
     QCOMPARE(writer.title(), QString());
@@ -150,8 +149,7 @@ void tst_QPdfWriter::testPageMetrics()
     QSizeF sizeMMf = QSizeF(widthMMf, heightMMf);
 
     QTemporaryFile file;
-    if (!file.open())
-        QSKIP("Couldn't open temp file!");
+    QVERIFY2(file.open(), qPrintable(file.errorString()));
     QPdfWriter writer(file.fileName());
     QCOMPARE(writer.pageLayout().orientation(), QPageLayout::Portrait);