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

Conflicts:
	src/corelib/io/qfilesystemwatcher_win.cpp
	src/corelib/plugin/plugin.pri
	src/plugins/platforms/cocoa/qcocoaaccessibility.mm
	tests/auto/corelib/tools/qlocale/tst_qlocale.cpp

Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index d9c823273c..8a97a9261f 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -295,6 +295,8 @@ private slots:
     void drawPolyline_data();
     void drawPolyline();
 
+    void QTBUG50153_drawImage_assert();
+
 private:
     void fillData();
     void setPenColor(QPainter& p);
@@ -5035,6 +5037,30 @@ void tst_QPainter::drawPolyline()
     QCOMPARE(images[0], images[1]);
 }
 
+void tst_QPainter::QTBUG50153_drawImage_assert()
+{
+    QImage::Format formats[] = {
+        QImage::Format_RGB32,  // fetchTransformedBilinearARGB32PM
+        QImage::Format_ARGB32  // fetchTransformedBilinear
+    };
+
+    for (unsigned i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) {
+        QImage image(3027, 2999, formats[i]);
+
+        QImage backingStore(image.size(), QImage::Format_ARGB32);
+        QPainter backingStorePainter(&backingStore);
+
+        QTransform transform;
+        transform.scale( 0.999987, 0.999987 );
+
+        backingStorePainter.setTransform(transform);
+        backingStorePainter.setRenderHint(QPainter::SmoothPixmapTransform, true);
+        backingStorePainter.drawImage(0, 0, image);
+
+        // No crash, all fine
+    }
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"