From 059cd5f6e111a52d3ba798bd7ebbb9c74e01fa01 Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Mon, 9 May 2022 17:01:14 -0700 Subject: [PATCH] Windows: Remove unused Qt 5 code and references --- Source/Core/DolphinQt/Main.cpp | 9 --------- Source/Core/DolphinQt/Settings.cpp | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp index 2f2b89e5e4..bd17fe5890 100644 --- a/Source/Core/DolphinQt/Main.cpp +++ b/Source/Core/DolphinQt/Main.cpp @@ -156,15 +156,6 @@ int main(int argc, char* argv[]) QApplication app(argc, argv); #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 FreeConsole(); #endif diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp index 3c5de2c1e4..0ecee648d8 100644 --- a/Source/Core/DolphinQt/Settings.cpp +++ b/Source/Core/DolphinQt/Settings.cpp @@ -119,8 +119,7 @@ QString Settings::GetCurrentUserStyle() const 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 -// Windows 10/Qt 5.15.0. But only if we set a stylesheet that isn't an empty string. +// Calling this before the main window has been created breaks the style of some widgets. void Settings::SetCurrentUserStyle(const QString& stylesheet_name) { QString stylesheet_contents;