diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp index 66429ec07..b29b2e23e 100644 --- a/src/modules/welcome/WelcomePage.cpp +++ b/src/modules/welcome/WelcomePage.cpp @@ -271,9 +271,9 @@ WelcomePage::externallySelectedLanguage( int row ) } void -WelcomePage::setLanguageIcon( QIcon i ) +WelcomePage::setLanguageIcon( QPixmap i ) { - ui->languageIcon->setPixmap( i.pixmap(48) ); + ui->languageIcon->setPixmap( i ); } diff --git a/src/modules/welcome/WelcomePage.h b/src/modules/welcome/WelcomePage.h index ec9044a68..6c244bf0c 100644 --- a/src/modules/welcome/WelcomePage.h +++ b/src/modules/welcome/WelcomePage.h @@ -43,7 +43,7 @@ public: bool showKnownIssuesUrl, bool showReleaseNotesUrl ); /// @brief Set international language-selector icon - void setLanguageIcon( QIcon ); + void setLanguageIcon( QPixmap ); /// @brief Results of requirements checking bool verdict() const; diff --git a/src/modules/welcome/WelcomeViewStep.cpp b/src/modules/welcome/WelcomeViewStep.cpp index 0f18cfa2d..a27cc4cf0 100644 --- a/src/modules/welcome/WelcomeViewStep.cpp +++ b/src/modules/welcome/WelcomeViewStep.cpp @@ -24,10 +24,12 @@ #include "geoip/Handler.h" #include "locale/Lookup.h" -#include "modulesystem/ModuleManager.h" #include "utils/Logger.h" #include "utils/Variant.h" +#include "Branding.h" +#include "modulesystem/ModuleManager.h" + #include #include @@ -142,7 +144,7 @@ WelcomeViewStep::setConfigurationMap( const QVariantMap& configurationMap ) QString language = CalamaresUtils::getString( configurationMap, "languageIcon" ); if ( !language.isEmpty() ) { - auto icon = QIcon::fromTheme( language ); + auto icon = Calamares::Branding::instance()->image( language, QSize( 48, 48 ) ); if ( !icon.isNull() ) m_widget->setLanguageIcon( icon ); }