diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-07-25 20:36:58 +0200 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-07-26 11:10:26 +0200 |
| commit | 5640d0d3c7df7e0eb03eb1921349066b0ee516b1 (patch) | |
| tree | 35036129da1280fc0a576bac727abd20e72d6bb5 | |
| parent | 1e39619034c7b0a3f190cdf2c1bafe5bc3e5cb62 (diff) | |
| download | rockbox-5640d0d3c7df7e0eb03eb1921349066b0ee516b1.tar.gz rockbox-5640d0d3c7df7e0eb03eb1921349066b0ee516b1.zip | |
rbutil: Call QLocale::setDefault() with QLocale.
QLocale::setDefault() shouldn't be called with a QString but a QLocale
instead. Calling it with a string doesn't work with Qt6 anymore.
Change-Id: I08826095cda8563e4ae9b83d08144da2d0d7f3c7
| -rw-r--r-- | rbutil/rbutilqt/configure.cpp | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 6bb947b64a..246b9a0fda 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
| @@ -630,7 +630,7 @@ void Config::updateLanguage() | |||
| 630 | RbUtilQt::translators.append(translator); | 630 | RbUtilQt::translators.append(translator); |
| 631 | RbUtilQt::translators.append(qttrans); | 631 | RbUtilQt::translators.append(qttrans); |
| 632 | 632 | ||
| 633 | QLocale::setDefault(language); | 633 | QLocale::setDefault(QLocale(language)); |
| 634 | 634 | ||
| 635 | } | 635 | } |
| 636 | 636 | ||
diff --git a/rbutil/rbutilqt/main.cpp b/rbutil/rbutilqt/main.cpp index 93fb0f4b31..203bdd1e20 100644 --- a/rbutil/rbutilqt/main.cpp +++ b/rbutil/rbutilqt/main.cpp | |||
| @@ -80,7 +80,7 @@ int main( int argc, char ** argv ) { | |||
| 80 | QLibraryInfo::location(QLibraryInfo::TranslationsPath))) | 80 | QLibraryInfo::location(QLibraryInfo::TranslationsPath))) |
| 81 | qttrans.load("qt_" + applang, ":/lang"); | 81 | qttrans.load("qt_" + applang, ":/lang"); |
| 82 | 82 | ||
| 83 | QLocale::setDefault(applang); | 83 | QLocale::setDefault(QLocale(applang)); |
| 84 | } | 84 | } |
| 85 | delete user; | 85 | delete user; |
| 86 | app.installTranslator(&translator); | 86 | app.installTranslator(&translator); |