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

Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2

7 files changed, 100 insertions, 3 deletions

diff --git a/tests/auto/gui/kernel/qguivariant/test/data/qpolygonf.bin b/tests/auto/gui/kernel/qguivariant/test/data/qpolygonf.bin
new file mode 100644
index 0000000000..02e749b83f
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/test/data/qpolygonf.bin
diff --git a/tests/auto/gui/kernel/qguivariant/test/qguivariant.qrc b/tests/auto/gui/kernel/qguivariant/test/qguivariant.qrc
new file mode 100644
index 0000000000..576d9cda1c
--- /dev/null
+++ b/tests/auto/gui/kernel/qguivariant/test/qguivariant.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>data</file>
+</qresource>
+</RCC>
diff --git a/tests/auto/gui/kernel/qguivariant/test/test.pro b/tests/auto/gui/kernel/qguivariant/test/test.pro
index 86ab17d9cd..c4123797d2 100644
--- a/tests/auto/gui/kernel/qguivariant/test/test.pro
+++ b/tests/auto/gui/kernel/qguivariant/test/test.pro
@@ -5,3 +5,4 @@ SOURCES  += tst_qguivariant.cpp
 RESOURCES = tst_qguivariant.qrc
 INCLUDEPATH += $$PWD/../../../../other/qvariant_common
 QT += testlib
+RESOURCES += qguivariant.qrc
diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index d5ec9fcfaa..1220ce3b23 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -114,6 +114,7 @@ private slots:
 
     void writeToReadFromDataStream_data();
     void writeToReadFromDataStream();
+    void writeToReadFromOldDataStream();
 
     void colorInteger();
     void invalidQColor();
@@ -527,6 +528,8 @@ void tst_QGuiVariant::writeToReadFromDataStream_data()
     QTest::newRow( "pointarray_valid" ) << QVariant::fromValue( QPolygon( QRect( 10, 10, 20, 20 ) ) ) << false;
     QTest::newRow( "region_invalid" ) << QVariant::fromValue( QRegion() ) << true;
     QTest::newRow( "region_valid" ) << QVariant::fromValue( QRegion( 10, 10, 20, 20 ) ) << false;
+    QTest::newRow("polygonf_invalid") << QVariant::fromValue(QPolygonF()) << true;
+    QTest::newRow("polygonf_valid") << QVariant::fromValue(QPolygonF(QRectF(10, 10, 20, 20))) << false;
 }
 
 void tst_QGuiVariant::invalidQColor()
@@ -611,6 +614,46 @@ void tst_QGuiVariant::writeToReadFromDataStream()
     }
 }
 
+void tst_QGuiVariant::writeToReadFromOldDataStream()
+{
+    QPolygonF polyF(QRectF(10, 10, 50, 50));
+    QVariant testVariant(polyF);
+    {
+        // Read into a variant and compare
+        QFile file(":/data/qpolygonf.bin");
+        QVERIFY(file.open(QIODevice::ReadOnly));
+        QDataStream dataFileStream(&file);
+        dataFileStream.setVersion(QDataStream::Qt_4_9);
+        QVariant readVariant;
+        dataFileStream >> readVariant;
+        QVERIFY(readVariant.type() == QMetaType::QPolygonF);
+        QCOMPARE(testVariant, readVariant);
+        file.close();
+    }
+    {
+        QByteArray variantData;
+        {
+            QDataStream varDataStream(&variantData, QIODevice::WriteOnly);
+            varDataStream << testVariant;
+        }
+        // Read into a bytearray and compare
+        QFile file(":/data/qpolygonf.bin");
+        QVERIFY(file.open(QIODevice::ReadOnly));
+        QDataStream dataFileStream(&file);
+        dataFileStream.setVersion(QDataStream::Qt_4_9);
+        int dummy;
+        dataFileStream >> dummy;
+        QByteArray polyData49;
+        dataFileStream >> polyData49;
+        file.close();
+        QByteArray polyData50;
+        QDataStream readVarData(variantData);
+        readVarData >> dummy;
+        readVarData >> polyData50;
+        QVERIFY(polyData49 == polyData50);
+    }
+}
+
 void tst_QGuiVariant::debugStream_data()
 {
     QTest::addColumn<QVariant>("variant");
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 7ad7880330..c4983f4462 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -223,7 +223,7 @@ void tst_QWindow::positioning()
 
     window.setWindowState(Qt::WindowFullScreen);
     QCoreApplication::processEvents();
-#ifdef Q_OS_MACX
+#ifdef Q_OS_OSX
     QEXPECT_FAIL("", "Multiple failures in this test on Mac OS X, see QTBUG-23059", Abort);
 #endif
     QTRY_COMPARE(window.received(QEvent::Resize), 2);
diff --git a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
index 3f6eaae89b..3d2cde5fd3 100644
--- a/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
+++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
@@ -502,10 +502,10 @@ void tst_QGlyphRun::drawMultiScriptText2()
     drawGlyphs.save("drawMultiScriptText2_drawGlyphIndexes.png");
 #endif
 
-#ifdef Q_OS_MACX
+#ifdef Q_OS_OSX
     if (drawGlyphs.toImage() != textLayoutDraw.toImage())
         QEXPECT_FAIL("", "See QTBUG-32690", Continue);
-#endif // Q_OS_MACX
+#endif // Q_OS_OSX
     QCOMPARE(drawGlyphs, textLayoutDraw);
 }
 
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 10e79065ee..b065f537f7 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -54,6 +54,7 @@
 #include <qabstracttextdocumentlayout.h>
 #include <qtextlist.h>
 #include <qtextcodec.h>
+#include <qguiapplication.h>
 #include <qurl.h>
 #include <qpainter.h>
 #include <qfontmetrics.h>
@@ -113,6 +114,7 @@ private slots:
     void toHtmlBodyBgColorRgba();
     void toHtmlBodyBgColorTransparent();
     void toHtmlRootFrameProperties();
+    void toHtmlLineHeightProperties();
     void capitalizationHtmlInExport();
     void wordspacingHtmlExport();
 
@@ -186,6 +188,9 @@ private slots:
 
     void QTBUG27354_spaceAndSoftSpace();
     void cssInheritance();
+
+    void QTBUG28998_linkColor();
+
 private:
     void backgroundImage_checkExpectedHtml(const QTextDocument &doc);
 
@@ -1856,6 +1861,25 @@ void tst_QTextDocument::toHtmlRootFrameProperties()
     QCOMPARE(doc.toHtml(), expectedOutput);
 }
 
+void tst_QTextDocument::toHtmlLineHeightProperties()
+{
+    CREATE_DOC_AND_CURSOR();
+
+    QTextBlock block = doc.firstBlock();
+    QTextBlockFormat blockFormat = block.blockFormat();
+    blockFormat.setLineHeight(200, QTextBlockFormat::ProportionalHeight);
+    cursor.setBlockFormat(blockFormat);
+
+    cursor.insertText("Blah");
+    QString expectedOutput("<p DEFAULTBLOCKSTYLE line-height:200%;\">Blah</p>");
+
+    expectedOutput.prepend(htmlHead);
+    expectedOutput.replace("DEFAULTBLOCKSTYLE", "style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;");
+    expectedOutput.append(htmlTail);
+
+    QCOMPARE(doc.toHtml(), expectedOutput);
+}
+
 void tst_QTextDocument::capitalizationHtmlInExport()
 {
     doc->setPlainText("Test");
@@ -2954,5 +2978,29 @@ void tst_QTextDocument::cssInheritance()
     }
 }
 
+void tst_QTextDocument::QTBUG28998_linkColor()
+{
+    QPalette pal;
+    pal.setColor(QPalette::Link, QColor("tomato"));
+    QGuiApplication::setPalette(pal);
+
+    QTextDocument doc;
+    doc.setHtml("<a href=\"http://www.qt-project.org\">Qt</a>");
+
+    QCOMPARE(doc.blockCount(), 1);
+    QTextBlock block = doc.firstBlock();
+    QVERIFY(block.isValid());
+
+    QTextFragment fragment = block.begin().fragment();
+    QVERIFY(fragment.isValid());
+
+    QTextCharFormat format = fragment.charFormat();
+    QVERIFY(format.isValid());
+    QVERIFY(format.isAnchor());
+    QCOMPARE(format.anchorHref(), QStringLiteral("http://www.qt-project.org"));
+
+    QCOMPARE(format.foreground(), pal.link());
+}
+
 QTEST_MAIN(tst_QTextDocument)
 #include "tst_qtextdocument.moc"