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

Change-Id: Ibce9bfef928ce39070183c488ce86ae32e5ea705

1 files changed, 60 insertions, 0 deletions

diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
index c79f787547..f66b16b970 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
@@ -59,6 +59,8 @@ private slots:
     void imageAtRightAlignedTab();
     void blockVisibility();
 
+    void largeImage();
+
 private:
     QTextDocument *doc;
 };
@@ -347,5 +349,63 @@ void tst_QTextDocumentLayout::blockVisibility()
     QCOMPARE(doc->size(), halfSize);
 }
 
+void tst_QTextDocumentLayout::largeImage()
+{
+     auto img = QImage(400, 500, QImage::Format_ARGB32_Premultiplied);
+     img.fill(Qt::black);
+
+     {
+         QTextDocument document;
+
+         document.addResource(QTextDocument::ImageResource,
+                 QUrl("data://test.png"), QVariant(img));
+         document.setPageSize({500, 504});
+
+         auto html = "<img src=\"data://test.png\">";
+         document.setHtml(html);
+
+         QCOMPARE(document.pageCount(), 2);
+     }
+
+     {
+         QTextDocument document;
+
+         document.addResource(QTextDocument::ImageResource,
+                 QUrl("data://test.png"), QVariant(img));
+         document.setPageSize({500, 508});
+
+         auto html = "<img src=\"data://test.png\">";
+         document.setHtml(html);
+
+         QCOMPARE(document.pageCount(), 1);
+     }
+
+     {
+         QTextDocument document;
+
+         document.addResource(QTextDocument::ImageResource,
+                 QUrl("data://test.png"), QVariant(img));
+         document.setPageSize({585, 250});
+
+         auto html = "<img src=\"data://test.png\">";
+         document.setHtml(html);
+
+         QCOMPARE(document.pageCount(), 3);
+     }
+
+     {
+         QTextDocument document;
+
+         document.addResource(QTextDocument::ImageResource,
+                 QUrl("data://test.png"), QVariant(img));
+         document.setPageSize({585, 258});
+
+         auto html = "<img src=\"data://test.png\">";
+         document.setHtml(html);
+
+         QCOMPARE(document.pageCount(), 2);
+     }
+}
+
 QTEST_MAIN(tst_QTextDocumentLayout)
 #include "tst_qtextdocumentlayout.moc"