From 5640d0d3c7df7e0eb03eb1921349066b0ee516b1 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 25 Jul 2020 20:36:58 +0200 Subject: 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 --- rbutil/rbutilqt/configure.cpp | 2 +- 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() 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); -- cgit v1.2.3