From 6afa04f16c268d97d4d41a5420594aac1f20881f Mon Sep 17 00:00:00 2001 From: Ievgenii Meshcheriakov Date: Tue, 1 Feb 2022 16:05:01 +0100 Subject: QLocale: Use Q_CORE_REMOVED_SINCE instead of explicit version checks Use Q_CORE_REMOVED_SINCE macro for languageToCode()/codeToLanguage() API changes. Pick-to: 6.3 Change-Id: I8cc5279b1272165541c345241af49523c0f25737 Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne --- src/corelib/compat/removed_api.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/corelib/compat') diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index fda9a3fe72..6c0a3c853e 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -133,6 +133,18 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char } # endif +#include "qlocale.h" + +QString QLocale::languageToCode(Language language) +{ + return languageToCode(language, QLocale::AnyLanguageCode); +} + +QLocale::Language QLocale::codeToLanguage(QStringView languageCode) noexcept +{ + return codeToLanguage(languageCode, QLocale::AnyLanguageCode); +} + #include "qoperatingsystemversion.h" int QOperatingSystemVersion::compare(const QOperatingSystemVersion &v1, -- cgit v1.2.3