diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 3203f85cc97..19c75b7b393 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -2142,6 +2142,7 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format) html += QLatin1String(" font-size:"); html += QString::number(format.intProperty(QTextFormat::FontPixelSize)); html += QLatin1String("px;"); + attributesEmitted = true; } if (format.hasProperty(QTextFormat::FontWeight) diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index a24d17dc3df..c0f0f1c2439 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -180,6 +180,8 @@ private slots: void copiedFontSize(); + void QTBUG25778_pixelSizeFromHtml(); + void htmlExportImportBlockCount(); private: @@ -2840,6 +2842,18 @@ void tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange() QCOMPARE(rec.first, QString("contentsChanged")); } +void tst_QTextDocument::QTBUG25778_pixelSizeFromHtml() +{ + QTextDocument document1; + QTextDocument document2; + + document1.setHtml("Foobar"); + document2.setHtml(document1.toHtml()); + + QTextCursor cursor(&document2); + QCOMPARE(cursor.charFormat().font().pixelSize(), 24); +} + void tst_QTextDocument::copiedFontSize() { QTextDocument documentInput;