Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #10697 from Dentomologist/windows_remove_qt5_code_…
…and_references

Windows: Remove unused Qt5 block and reference
  • Loading branch information
Tilka committed May 28, 2022
2 parents 2d6fe6a + 059cd5f commit 57e444c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
9 changes: 0 additions & 9 deletions Source/Core/DolphinQt/Main.cpp
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions Source/Core/DolphinQt/Settings.cpp
Expand Up @@ -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;
Expand Down

0 comments on commit 57e444c

Please sign in to comment.