From 1563e0173ee3814e9717bd3bd959f3b39c70b5ee Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 13 Jun 2024 16:08:09 +0200 Subject: [PATCH] TextEditor: Fix some deprecation warnings QT_DEPRECATED_VERSION_X_6_1("Use setFontFamilies instead") inline void setFontFamily(const QString &family) { setProperty(FontFamilies, QVariant(QStringList(family))); } Change-Id: I22f48abf783404a80e9d8d604d1ff886c2a55f14 Reviewed-by: David Schulz --- .../qmldesigner/components/richtexteditor/richtexteditor.cpp | 2 +- src/plugins/texteditor/fontsettings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp index 8a9ed00c400..940b121b9ed 100644 --- a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp +++ b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp @@ -532,7 +532,7 @@ void RichTextEditor::setupFontActions() w->setCurrentIndex(w->findText(m_textEdit->currentCharFormat().font().family())); connect(w, &QComboBox::textActivated, [this](const QString &f) { QTextCharFormat fmt; - fmt.setFontFamily(f); + fmt.setFontFamilies({f}); mergeFormatOnWordOrSelection(fmt); }); }); diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index 44b179d01c8..3cb58fd1282 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -156,7 +156,7 @@ QTextCharFormat FontSettings::toTextCharFormat(TextStyle category) const QTextCharFormat tf; if (category == C_TEXT) { - tf.setFontFamily(m_family); + tf.setFontFamilies({m_family}); tf.setFontPointSize(m_fontSize * m_fontZoom / 100.); tf.setFontStyleStrategy(m_antialias ? QFont::PreferAntialias : QFont::NoAntialias); }