summaryrefslogtreecommitdiffstats
path: root/src/corelib/compat/removed_api.cpp
diff options
context:
space:
mode:
authorIevgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>2022-02-01 16:05:01 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-02-03 18:31:44 +0100
commit6afa04f16c268d97d4d41a5420594aac1f20881f (patch)
tree9d95b0e7548ac9469c8181da3f7c12aa36f95937 /src/corelib/compat/removed_api.cpp
parentb0e8ba783b6c6225fcedf5130726ee43f8ce1aa4 (diff)
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 <marc.mutz@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/compat/removed_api.cpp')
-rw-r--r--src/corelib/compat/removed_api.cpp12
1 files changed, 12 insertions, 0 deletions
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,