archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Windows: Remove unused Qt 5 code and references

Browse source
This commit is contained in:
Dentomologist 2022-05-09 17:01:14 -07:00
parent 7fcc866c41
commit 059cd5f6e1
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/DolphinQt/Main.cpp
View file

@ -156,15 +156,6 @@ int main(int argc, char* argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
#endif #endif
#if defined(_WIN32) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
// On Windows, Qt 5's default system font (MS Shell Dlg 2) is outdated.
// Interestingly, the QMenu font is correct and comes from lfMenuFont
// (Segoe UI on English computers).
// So use it for the entire application.
// This code will become unnecessary and obsolete once we switch to Qt 6.
QApplication::setFont(QApplication::font("QMenu"));
#endif
#ifdef _WIN32 #ifdef _WIN32
FreeConsole(); FreeConsole();
#endif #endif

3
Source/Core/DolphinQt/Settings.cpp
View file

@ -119,8 +119,7 @@ QString Settings::GetCurrentUserStyle() const
return QFileInfo(GetQSettings().value(QStringLiteral("userstyle/path")).toString()).fileName(); return QFileInfo(GetQSettings().value(QStringLiteral("userstyle/path")).toString()).fileName();
} }
// Calling this before the main window has been created breaks the style of some widgets on // Calling this before the main window has been created breaks the style of some widgets.
// Windows 10/Qt 5.15.0. But only if we set a stylesheet that isn't an empty string.
void Settings::SetCurrentUserStyle(const QString& stylesheet_name) void Settings::SetCurrentUserStyle(const QString& stylesheet_name)
{ {
QString stylesheet_contents; QString stylesheet_contents;