diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-26 21:26:29 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-11-27 07:28:24 +0000 |
| commit | c2dbc268937314e4a3825255a88a0e39bb8673a4 (patch) | |
| tree | 311b3a6682af04532442f339cdbe150f24ba848c /src | |
| parent | 63c5d13885506c6133ca8d0e568e3aa54d85c84c (diff) | |
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 <andy.shaw@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qtextodfwriter.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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); } |