diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2024-04-16 13:19:03 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2024-04-16 13:59:55 +0300 |
| commit | 48c3a69f6deb15304c2f3686492b69580d29d585 (patch) | |
| tree | 3a17c53549371c180c4eceb407fc762e80afbb8b /src | |
| parent | 18a7e6f34f3b118ee4652d9af93bc3ed2b8da499 (diff) | |
Fix signal about loaded language
QLocale::Languege does not distinguish between Brazilian Portuguese and
European Portuguese. Sending the QLocale object in
defaultTranslationsLoadedForLanguage signal to make a difference between
these languages.
Change-Id: I95994e00b67e2bd18a611d4c9a14d4a6cf57b204
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 2 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore.h | 2 | ||||
| -rw-r--r-- | src/sdk/sdkapp.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 2fb39a4a8..66220bd1d 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -202,7 +202,7 @@ using namespace QInstaller; */ /*! - \fn QInstaller::PackageManagerCore::defaultTranslationsLoadedForLanguage(QLocale::Language lang) + \fn QInstaller::PackageManagerCore::defaultTranslationsLoadedForLanguage(QLocale lang) Emitted when the language \a lang has changed. diff --git a/src/libs/installer/packagemanagercore.h b/src/libs/installer/packagemanagercore.h index a6d16add7..97f80416a 100644 --- a/src/libs/installer/packagemanagercore.h +++ b/src/libs/installer/packagemanagercore.h @@ -419,7 +419,7 @@ Q_SIGNALS: void componentAdded(QInstaller::Component *comp); void valueChanged(const QString &key, const QString &value); void statusChanged(QInstaller::PackageManagerCore::Status); - void defaultTranslationsLoadedForLanguage(QLocale::Language lang); + void defaultTranslationsLoadedForLanguage(QLocale lang); void currentPageChanged(int page); void finishButtonClicked(); diff --git a/src/sdk/sdkapp.h b/src/sdk/sdkapp.h index 07628ade3..eef0110ec 100644 --- a/src/sdk/sdkapp.h +++ b/src/sdk/sdkapp.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2022 The Qt Company Ltd. +** Copyright (C) 2024 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -428,7 +428,7 @@ public: } m_core->setValue(QInstaller::scUILanguage, lang.name()); - emit m_core->defaultTranslationsLoadedForLanguage(lang.language()); + emit m_core->defaultTranslationsLoadedForLanguage(lang); ProductKeyCheck::instance()->addPackagesFromXml(QLatin1String(":/metadata/Updates.xml")); return true; |