oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

various: ensure qt 5 compatibility

Browse Source
This commit is contained in:
itsmattkc
2022-10-31 18:18:49 -07:00
parent e94580c369
commit c5a86af181
6 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewertexteditor.cpp
+4 -4
View File
@@ -160,7 +160,7 @@ void ViewerTextEditor::UpdateToolBar(ViewerTextEditorToolBar *toolbar, const QTe
}
QString style = f.fontStyleName().toString();
QStringList styles = QFontDatabase::styles(family);
QStringList styles = QFontDatabase().styles(family);
if (!styles.isEmpty() && (style.isEmpty() || !styles.contains(style))) {
// There seems to be no better way to find the "regular" style outside of this heuristic.
// Feel free to add more if a font isn't working right.
@@ -267,8 +267,8 @@ void ViewerTextEditor::ApplyStyle(QTextCharFormat *format, const QString &family
{
// NOTE: Windows appears to require setting weight and italic manually, while macOS and Linux are
// perfectly fine with just the style name
format->setFontWeight(QFontDatabase::weight(family, style));
format->setFontItalic(QFontDatabase::italic(family, style));
format->setFontWeight(QFontDatabase().weight(family, style));
format->setFontItalic(QFontDatabase().italic(family, style));
format->setFontStyleName(style);
}
@@ -536,7 +536,7 @@ void ViewerTextEditorToolBar::UpdateFontStyleList(const QString &family)
style_combo_->blockSignals(true);
style_combo_->clear();
QStringList l = QFontDatabase::styles(family);
QStringList l = QFontDatabase().styles(family);
foreach (const QString &style, l) {
style_combo_->addItem(style);
}