diff options
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qtextdocument/tst_qtextdocument.cpp | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index a1cae54cfe..5d8ff97d80 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -2187,6 +2187,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/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp index c02d30ca48..83ca642975 100644 --- a/tests/auto/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp @@ -181,6 +181,7 @@ private slots: void escape(); void copiedFontSize(); + void QTBUG25778_pixelSizeFromHtml(); void htmlExportImportBlockCount(); @@ -2738,6 +2739,18 @@ void tst_QTextDocument::escape() QCOMPARE(Qt::escape(original), expected); } +void tst_QTextDocument::QTBUG25778_pixelSizeFromHtml() +{ + QTextDocument document1; + QTextDocument document2; + + document1.setHtml("<span style=\"font-size: 24px\">Foobar</span>"); + document2.setHtml(document1.toHtml()); + + QTextCursor cursor(&document2); + QCOMPARE(cursor.charFormat().font().pixelSize(), 24); +} + void tst_QTextDocument::copiedFontSize() { QTextDocument documentInput; |