diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:42 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 11:38:42 +0200 |
| commit | c41153e69336701488385d9194d72e72164b28b8 (patch) | |
| tree | b6305df3ec9c535756c788f542af833f5b2a265c /src | |
| parent | 9c6347f24509bff1dc6b87493adf487c22092990 (diff) | |
| parent | 2e0003eda4783f69a40fb4b31e7084c761d9640d (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 36f3c6cb4f..9169955617 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -2099,6 +2099,10 @@ QString QTextHtmlExporter::toHtml(const QByteArray &encoding, ExportMode mode) html += QLatin1String(" font-size:"); html += QString::number(defaultCharFormat.fontPointSize()); html += QLatin1String("pt;"); + } else if (defaultCharFormat.hasProperty(QTextFormat::FontPixelSize)) { + html += QLatin1String(" font-size:"); + html += QString::number(defaultCharFormat.intProperty(QTextFormat::FontPixelSize)); + html += QLatin1String("px;"); } html += QLatin1String(" font-weight:"); @@ -2179,6 +2183,10 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format) html += QLatin1Char(';'); attributesEmitted = true; } + } else if (format.hasProperty(QTextFormat::FontPixelSize)) { + html += QLatin1String(" font-size:"); + html += QString::number(format.intProperty(QTextFormat::FontPixelSize)); + html += QLatin1String("px;"); } if (format.hasProperty(QTextFormat::FontWeight) |