AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 17:47:42 +00:00
Code Issues Projects Releases Wiki Activity

Allow compiling with Qt5 again (Qt6 is preferred)

Browse Source 
Small fix to Quazip, removes extraneous files
This commit is contained in:
Luke Street
2021-02-21 13:23:20 -05:00
parent 8838add29d
commit e1515252f1
21 changed files with 51 additions and 1665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hecl-gui/EscapeSequenceParser.cpp
View File

@@ -64,6 +64,7 @@ void ParseEscapeSequence(int attribute, QListIterator<QString>& i, QTextCharForm
case 17:
case 18:
case 19: {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QString fontFamily = textCharFormat.fontFamily();
QStringList fontStyles = QFontDatabase::styles(fontFamily);
int fontStyleIndex = attribute - 11;
@@ -71,6 +72,16 @@ void ParseEscapeSequence(int attribute, QListIterator<QString>& i, QTextCharForm
textCharFormat.setFont(
QFontDatabase::font(fontFamily, fontStyles.at(fontStyleIndex), textCharFormat.font().pointSize()));
}
#else
QFontDatabase fontDatabase;
QString fontFamily = textCharFormat.fontFamily();
QStringList fontStyles = fontDatabase.styles(fontFamily);
int fontStyleIndex = attribute - 11;
if (fontStyleIndex < fontStyles.length()) {
textCharFormat.setFont(
fontDatabase.font(fontFamily, fontStyles.at(fontStyleIndex), textCharFormat.font().pointSize()));
}
#endif
break;
}
case 20: { // Fraktur (unsupported)