Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"

1 files changed, 10 insertions, 1 deletions

diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 0b1a23f399..1ee317d27c 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -1548,7 +1548,16 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
                         n -= 3;
                     node->charFormat.setProperty(QTextFormat::FontSizeAdjustment, n);
                 } else if (key == QLatin1String("face")) {
-                    node->charFormat.setFontFamily(value);
+                    if (value.contains(QLatin1Char(','))) {
+                        const QStringList values = value.split(QLatin1Char(','));
+                        QStringList families;
+                        for (const QString &family : values)
+                            families << family.trimmed();
+                        node->charFormat.setFontFamilies(families);
+                        node->charFormat.setFontFamily(families.at(0));
+                    } else {
+                        node->charFormat.setFontFamily(value);
+                    }
                 } else if (key == QLatin1String("color")) {
                     QColor c; c.setNamedColor(value);
                     if (!c.isValid())