summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-07-25 20:36:58 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-07-26 11:10:26 +0200
commit5640d0d3c7df7e0eb03eb1921349066b0ee516b1 (patch)
tree35036129da1280fc0a576bac727abd20e72d6bb5
parent1e39619034c7b0a3f190cdf2c1bafe5bc3e5cb62 (diff)
downloadrockbox-5640d0d.tar.gz
rockbox-5640d0d.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.cpp2
-rw-r--r--rbutil/rbutilqt/main.cpp2
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()
RbUtilQt::translators.append(translator);
RbUtilQt::translators.append(qttrans);
- QLocale::setDefault(language);
+ QLocale::setDefault(QLocale(language));
}
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 ) {
QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
qttrans.load("qt_" + applang, ":/lang");
- QLocale::setDefault(applang);
+ QLocale::setDefault(QLocale(applang));
}
delete user;
app.installTranslator(&translator);