Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	.qmake.conf
	src/network/ssl/qsslsocket_openssl.cpp

Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io>
Change-Id: Ibb57a0548b4977797b400637487a56245ac1c024

2 files changed, 32 insertions, 2 deletions

diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 2ec3f41f42..dc34a96918 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -2306,7 +2306,11 @@ QString QTextHtmlExporter::toHtml(const QByteArray &encoding, ExportMode mode)
     if (mode == ExportEntireDocument) {
         html += QLatin1String(" style=\"");
 
-        emitFontFamily(defaultCharFormat.fontFamily());
+        QStringList fontFamilies = defaultCharFormat.fontFamilies().toStringList();
+        if (!fontFamilies.isEmpty())
+            emitFontFamily(fontFamilies);
+        else
+            emitFontFamily(defaultCharFormat.fontFamily());
 
         if (defaultCharFormat.hasProperty(QTextFormat::FontPointSize)) {
             html += QLatin1String(" font-size:");
@@ -2368,8 +2372,12 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
     bool attributesEmitted = false;
 
     {
+        const QStringList families = format.fontFamilies().toStringList();
         const QString family = format.fontFamily();
-        if (!family.isEmpty() && family != defaultCharFormat.fontFamily()) {
+        if (!families.isEmpty() && families != defaultCharFormat.fontFamilies().toStringList()) {
+            emitFontFamily(families);
+            attributesEmitted = true;
+        } else if (!family.isEmpty() && family != defaultCharFormat.fontFamily()) {
             emitFontFamily(family);
             attributesEmitted = true;
         }
@@ -2656,6 +2664,27 @@ void QTextHtmlExporter::emitFontFamily(const QString &family)
     html += QLatin1Char(';');
 }
 
+void QTextHtmlExporter::emitFontFamily(const QStringList &families)
+{
+    html += QLatin1String(" font-family:");
+
+    bool first = true;
+    for (const QString &family : families) {
+        QLatin1String quote("\'");
+        if (family.contains(QLatin1Char('\'')))
+            quote = QLatin1String(""");
+
+        if (!first)
+            html += QLatin1String(",");
+        else
+            first = false;
+        html += quote;
+        html += family.toHtmlEscaped();
+        html += quote;
+    }
+    html += QLatin1Char(';');
+}
+
 void QTextHtmlExporter::emitMargins(const QString &top, const QString &bottom, const QString &left, const QString &right)
 {
     html += QLatin1String(" margin-top:");
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index df00fb7d84..f4e7a25f22 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -397,6 +397,7 @@ private:
     void emitPageBreakPolicy(QTextFormat::PageBreakFlags policy);
 
     void emitFontFamily(const QString &family);
+    void emitFontFamily(const QStringList &families);
 
     void emitBackgroundAttribute(const QTextFormat &format);
     QString findUrlForImage(const QTextDocument *doc, qint64 cacheKey, bool isPixmap);