Merge remote-tracking branch 'origin/5.12' into 5.12.1

 Conflicts:
	src/widgets/kernel/qtooltip.cpp

Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 9bf9e99bf9..bc0baed15c 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -299,6 +299,8 @@ private slots:
 
     void fillPolygon();
 
+    void drawImageAtPointF();
+
 private:
     void fillData();
     void setPenColor(QPainter& p);
@@ -5292,6 +5294,20 @@ void tst_QPainter::fillPolygon()
     }
 }
 
+void tst_QPainter::drawImageAtPointF()
+{
+    // Just test we do not crash
+    QImage image1(10, 10, QImage::Format_RGB32);
+    QImage image2(200, 200, QImage::Format_RGB32);
+
+    QPainter paint(&image2);
+    paint.setClipRect(97, 46, 14, 14);
+    paint.setCompositionMode(QPainter::CompositionMode_Source);
+    paint.drawImage(QPointF(96, std::numeric_limits<int>::max()), image1);
+    paint.drawImage(QPointF(std::numeric_limits<int>::min(), 48), image1);
+    paint.end();
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"