diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index df25162a89..76d316517d 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -679,7 +679,7 @@ void QTextOdfWriter::writeCharacterFormat(QXmlStreamWriter &writer, QTextCharFor
writer.writeAttribute(foNS, QString::fromLatin1("font-weight"), value);
}
if (format.hasProperty(QTextFormat::FontFamily))
- writer.writeAttribute(foNS, QString::fromLatin1("font-family"), format.fontFamily());
+ writer.writeAttribute(foNS, QString::fromLatin1("font-family"), format.fontFamilies().toStringList().value(0, QString()));
else
writer.writeAttribute(foNS, QString::fromLatin1("font-family"), QString::fromLatin1("Sans")); // Qt default
if (format.hasProperty(QTextFormat::FontPointSize))
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index ad307606d1..2531c6f5d0 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -686,7 +686,7 @@ qreal QTextEdit::fontPointSize() const
QString QTextEdit::fontFamily() const
{
Q_D(const QTextEdit);
- return d->control->textCursor().charFormat().fontFamily();
+ return d->control->textCursor().charFormat().fontFamilies().toStringList().value(0, QString());
}
/*!
@@ -878,7 +878,7 @@ QTextCursor QTextEdit::textCursor() const
void QTextEdit::setFontFamily(const QString &fontFamily)
{
QTextCharFormat fmt;
- fmt.setFontFamily(fontFamily);
+ fmt.setFontFamilies({fontFamily});
mergeCurrentCharFormat(fmt);
}
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index a018279098..c308ce31b1 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -806,7 +806,7 @@ void tst_QTextDocument::toHtml_data()
CREATE_DOC_AND_CURSOR();
QTextCharFormat fmt;
- fmt.setFontFamily("Times");
+ fmt.setFontFamilies({QLatin1String("Times")});
cursor.insertText("Blah", fmt);
QTest::newRow("font-family") << QTextDocumentFragment(&doc)
@@ -817,7 +817,7 @@ void tst_QTextDocument::toHtml_data()
CREATE_DOC_AND_CURSOR();
QTextCharFormat fmt;
- fmt.setFontFamily("Foo's Family");
+ fmt.setFontFamilies({QLatin1String("Foo's Family")});
cursor.insertText("Blah", fmt);
QTest::newRow("font-family-with-quotes1") << QTextDocumentFragment(&doc)
@@ -828,7 +828,7 @@ void tst_QTextDocument::toHtml_data()
CREATE_DOC_AND_CURSOR();
QTextCharFormat fmt;
- fmt.setFontFamily("Foo\"s Family");
+ fmt.setFontFamilies({QLatin1String("Foo\"s Family")});
cursor.insertText("Blah", fmt);
QTest::newRow("font-family-with-quotes2") << QTextDocumentFragment(&doc)
@@ -839,7 +839,6 @@ void tst_QTextDocument::toHtml_data()
CREATE_DOC_AND_CURSOR();
QTextCharFormat fmt;
- fmt.setFontFamily("Times");
fmt.setFontFamilies(QStringList{ "Times", "serif" });
cursor.insertText("Blah", fmt);
@@ -3540,7 +3539,7 @@ void tst_QTextDocument::fontTagFace()
td.setHtml("Foobar");
QTextFragment fragment = td.begin().begin().fragment();
QTextCharFormat format = fragment.charFormat();
- QCOMPARE(format.fontFamily(), QLatin1String("Times"));
+ QCOMPARE(format.fontFamilies().toStringList().value(0, QString()), QLatin1String("Times"));
}
{
@@ -3548,7 +3547,7 @@ void tst_QTextDocument::fontTagFace()
td.setHtml("Foobar");
QTextFragment fragment = td.begin().begin().fragment();
QTextCharFormat format = fragment.charFormat();
- QCOMPARE(format.fontFamily(), QLatin1String("Times"));
+ QCOMPARE(format.fontFamilies().toStringList().value(0, QString()), QLatin1String("Times"));
QStringList expectedFamilies = { QLatin1String("Times"), QLatin1String("serif") };
QCOMPARE(format.fontFamilies().toStringList(), expectedFamilies);
}
@@ -3563,7 +3562,7 @@ void tst_QTextDocument::mergeFontFamilies()
"