From c64ecd1e7b050dd9f7b7bd4e0ff4a467415c2f7b Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 11 Sep 2024 16:34:59 +0200 Subject: [PATCH] Qt6: QLocale::countryToString and QLocale::country() are deprecated since Qt 6.6 --- src/Gui/Splashscreen.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Gui/Splashscreen.cpp b/src/Gui/Splashscreen.cpp index da6f9e48cf..da3241dc18 100644 --- a/src/Gui/Splashscreen.cpp +++ b/src/Gui/Splashscreen.cpp @@ -871,12 +871,20 @@ void AboutDialog::copyToClipboard() #endif QLocale loc; str << "Locale: " << QLocale::languageToString(loc.language()) << "/" +#if QT_VERSION < QT_VERSION_CHECK(6,6,0) << QLocale::countryToString(loc.country()) +#else + << QLocale::territoryToString(loc.territory()) +#endif << " (" << loc.name() << ")"; if (loc != QLocale::system()) { loc = QLocale::system(); str << " [ OS: " << QLocale::languageToString(loc.language()) << "/" +#if QT_VERSION < QT_VERSION_CHECK(6,6,0) << QLocale::countryToString(loc.country()) +#else + << QLocale::territoryToString(loc.territory()) +#endif << " (" << loc.name() << ") ]"; } str << "\n";