LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Manually merged #6084 to master

Browse source
This commit is contained in:
anatoly-os 2020-08-20 13:51:39 +03:00
parent 2116e065a5
commit 9cb0a2eb48
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libmscore/mscore.cpp
View file

@ -394,6 +394,21 @@ void MScore::init()
}
}
}
#endif
// Workaround for QTBUG-73241 (solved in Qt 5.12.2) in Windows 10, see https://musescore.org/en/node/280244
#if defined(Q_OS_WIN) && (QT_VERSION < QT_VERSION_CHECK(5, 12, 2))
if (QOperatingSystemVersion::current().majorVersion() >= 10) {
const QDir additionalFontsDir(QString("%1/Microsoft/Windows/Fonts").arg(QStandardPaths::writableLocation(QStandardPaths::
GenericDataLocation)));
if (additionalFontsDir.exists()) {
QFileInfoList fileList = additionalFontsDir.entryInfoList();
for (int i = 0; i < fileList.size(); ++i) {
QFileInfo fileInfo = fileList.at(i);
QFontDatabase::addApplicationFont(fileInfo.filePath());
}
}
}
#endif
initScoreFonts();
StaffType::initStaffTypes();