Merge pull request #10697 from Dentomologist/windows_remove_qt5_code_and_references
Windows: Remove unused Qt5 block and reference
This commit is contained in:
commit
57e444cd5d
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue