diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-09-12 12:13:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-12 16:05:12 +0200 |
| commit | e640ebacb97f6eea9614925b1da3b97a0ff51409 (patch) | |
| tree | caf05a1bd603e1c05a42359e1531064a3bfcf29e /tests/auto | |
| parent | ee1e37cc64bf68f221e80dd0aa11c571f2e40a33 (diff) | |
| download | qtbase-e640ebacb97f6eea9614925b1da3b97a0ff51409.tar.gz | |
Fix regression in QTextDocument::toHtml() with font pixel size
Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were
missing a attributesEmitted=true which caused the output from
toHtml() to sometimes be invalid when using pixel sizes to
specify the font size.
Task-number: QTBUG-25778
Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index a24d17dc3d..c0f0f1c243 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("<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; |