feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Fix some deprecation warnings

Browse Source 
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 <david.schulz@qt.io>
This commit is contained in:
hjk
2024-06-13 16:08:09 +02:00
parent 39570fb675
commit 1563e0173e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp
View File

@@ -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);
});
});

2
src/plugins/texteditor/fontsettings.cpp
View File

@@ -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);
}