From c2dbc268937314e4a3825255a88a0e39bb8673a4 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 26 Nov 2020 21:26:29 +0100 Subject: Fix compiler warnings from deprecated method QTextCharFormat::fontFamily is deprecated in favor of fontFamilies, which returns a QStringList wrapped in a QVariant, whereas the setter expects a QStringList. Change-Id: I3333eaae4fc5ec3e3bdbec58047d6b3554b4a171 Reviewed-by: Andy Shaw --- src/widgets/widgets/qtextedit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/widgets/widgets') 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); } -- cgit v1.2.3