summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocument.cpp
diff options
context:
space:
mode:
authorViktor Arvidsson <viktor.arvidss@gmail.com>2024-01-14 02:53:02 +0100
committerViktor Arvidsson <viktor.arvidss@gmail.com>2024-01-18 17:59:19 +0100
commit2f9dcf231af1a836c19bffbea3f7f566b4a90083 (patch)
tree8451710ee030f5219b33f88eab5ed05dc07a03ec /src/gui/text/qtextdocument.cpp
parent06ea3e3994b38e5fe9ac4f33044b0efa1f1be294 (diff)
QTextDocument: Add missing default pixel font size check for html export
If the size of the documents default font is specified in pixels all text ranges would get wrapped in a span specifying the font size again. Change-Id: Iae2ea34d79bb6253badd8a0575489d3fb6409eba Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
-rw-r--r--src/gui/text/qtextdocument.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index ea0cc27f59..df00c809d1 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -2550,7 +2550,9 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
html += u';';
attributesEmitted = true;
}
- } else if (format.hasProperty(QTextFormat::FontPixelSize)) {
+ } else if (format.hasProperty(QTextFormat::FontPixelSize)
+ && format.property(QTextFormat::FontPixelSize)
+ != defaultCharFormat.property(QTextFormat::FontPixelSize)) {
html += " font-size:"_L1;
html += QString::number(format.intProperty(QTextFormat::FontPixelSize));
html += "px;"_L1;