diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index fda9a3fe72f..6c0a3c853ee 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, diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index dbfdbceac5a..4d859d32ee0 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -1430,17 +1430,6 @@ QString QLocale::languageToCode(Language language, LanguageCodeTypes codeTypes) return QLocalePrivate::languageToCode(language, codeTypes); } -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -/*! - \overload - \since 6.1 -*/ -QString QLocale::languageToCode(Language language) -{ - return QLocalePrivate::languageToCode(language); -} -#endif - /*! Returns the QLocale::Language enum corresponding to the two- or three-letter \a languageCode, as defined in the ISO 639 standards. @@ -1461,17 +1450,6 @@ QLocale::Language QLocale::codeToLanguage(QStringView languageCode, return QLocalePrivate::codeToLanguage(languageCode, codeTypes); } -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -/*! - \overload - \since 6.1 -*/ -QLocale::Language QLocale::codeToLanguage(QStringView languageCode) noexcept -{ - return QLocalePrivate::codeToLanguage(languageCode); -} -#endif - /*! \since 6.2 diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index 7f1d47063b3..5612d460d27 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -1104,16 +1104,13 @@ public: }; Q_DECLARE_FLAGS(LanguageCodeTypes, LanguageCodeType) -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) +#if QT_CORE_REMOVED_SINCE(6, 3) static QString languageToCode(Language language); - static QString languageToCode(Language language, LanguageCodeTypes codeTypes); static Language codeToLanguage(QStringView languageCode) noexcept; - static Language codeToLanguage(QStringView languageCode, LanguageCodeTypes codeTypes) noexcept; -#else +#endif static QString languageToCode(Language language, LanguageCodeTypes codeTypes = AnyLanguageCode); static Language codeToLanguage(QStringView languageCode, LanguageCodeTypes codeTypes = AnyLanguageCode) noexcept; -#endif static QString territoryToCode(Territory territory); static Territory codeToTerritory(QStringView territoryCode) noexcept; #if QT_DEPRECATED_SINCE(6, 6)