1 files changed, 52 insertions, 1 deletions

diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 642f0893b4..1ee317d27c 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -1335,6 +1335,17 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
             default: break;
             }
             break;
+
+        case QCss::QtForegroundTextureCacheKey:
+        {
+            if (resourceProvider != nullptr && resourceProvider->docHandle() != nullptr) {
+                bool ok;
+                qint64 searchKey = decl.d->values.first().variant.toLongLong(&ok);
+                if (ok)
+                    applyForegroundImage(searchKey, resourceProvider);
+            }
+            break;
+        }
         default: break;
         }
     }
@@ -1367,6 +1378,37 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
 
 #endif // QT_NO_CSSPARSER
 
+void QTextHtmlParserNode::applyForegroundImage(qint64 searchKey, const QTextDocument *resourceProvider)
+{
+    QTextDocumentPrivate *priv = resourceProvider->docHandle();
+    for (int i = 0; i < priv->formats.numFormats(); ++i) {
+        QTextCharFormat format = priv->formats.charFormat(i);
+        if (format.isValid()) {
+            QBrush brush = format.foreground();
+            if (brush.style() == Qt::TexturePattern) {
+                const bool isPixmap = qHasPixmapTexture(brush);
+
+                if (isPixmap && QCoreApplication::instance()->thread() != QThread::currentThread()) {
+                    qWarning("Can't apply QPixmap outside of GUI thread");
+                    return;
+                }
+
+                const qint64 cacheKey = isPixmap ? brush.texture().cacheKey() : brush.textureImage().cacheKey();
+                if (cacheKey == searchKey) {
+                    QBrush b;
+                    if (isPixmap)
+                        b.setTexture(brush.texture());
+                    else
+                        b.setTextureImage(brush.textureImage());
+                    b.setStyle(Qt::TexturePattern);
+                    charFormat.setForeground(b);
+                }
+            }
+        }
+    }
+
+}
+
 void QTextHtmlParserNode::applyBackgroundImage(const QString &url, const QTextDocument *resourceProvider)
 {
     if (!url.isEmpty() && resourceProvider) {
@@ -1506,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())