From 74453865813a9ee9564535b95ed40e6ca811836b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 15 Jun 2021 14:27:29 +0200 Subject: [PATCH] StudioWelcome: Do not use TitilliumWeb on Windows TitilliumWeb creates issues with Qt 6 on Windows. Task-number: QDS-4539 Change-Id: I70782cc7399622e851b01ed997d1919b624fce3b Reviewed-by: Tim Jenssen --- src/plugins/studiowelcome/studiowelcomeplugin.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 55400a3a016..39660b5235f 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -332,10 +333,11 @@ bool StudioWelcomePlugin::initialize(const QStringList &arguments, QString *erro m_welcomeMode = new WelcomeMode; - QFontDatabase fonts; - QFontDatabase::addApplicationFont(":/studiofonts/TitilliumWeb-Regular.ttf"); - QFont systemFont("Titillium Web", QApplication::font().pointSize()); - QApplication::setFont(systemFont); + if (!Utils::HostOsInfo::isWindowsHost()) { + QFontDatabase::addApplicationFont(":/studiofonts/TitilliumWeb-Regular.ttf"); + QFont systemFont("Titillium Web", QApplication::font().pointSize()); + QApplication::setFont(systemFont); + } m_removeSplashTimer.setSingleShot(true); m_removeSplashTimer.setInterval(15000);