1 files changed, 27 insertions, 4 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 152c2edb50..f6eaa53c3a 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -94,7 +94,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #include "qlocale_data_p.h"
 QT_END_INCLUDE_NAMESPACE
 
-QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) Q_DECL_NOTHROW
+QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) noexcept
 {
     const auto len = code.size();
     if (len != 2 && len != 3)
@@ -138,7 +138,7 @@ QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) Q_DECL_NOTHRO
     return QLocale::C;
 }
 
-QLocale::Script QLocalePrivate::codeToScript(QStringView code) Q_DECL_NOTHROW
+QLocale::Script QLocalePrivate::codeToScript(QStringView code) noexcept
 {
     const auto len = code.size();
     if (len != 4)
@@ -158,7 +158,7 @@ QLocale::Script QLocalePrivate::codeToScript(QStringView code) Q_DECL_NOTHROW
     return QLocale::AnyScript;
 }
 
-QLocale::Country QLocalePrivate::codeToCountry(QStringView code) Q_DECL_NOTHROW
+QLocale::Country QLocalePrivate::codeToCountry(QStringView code) noexcept
 {
     const auto len = code.size();
     if (len != 2 && len != 3)
@@ -982,7 +982,7 @@ bool QLocale::operator!=(const QLocale &other) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QLocale &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QLocale &key, uint seed) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.d->m_data);
@@ -4143,6 +4143,29 @@ QStringList QLocale::uiLanguages() const
 }
 
 /*!
+  \since 5.13
+
+  Returns the locale to use for collation.
+
+  The result is usually this locale; however, the system locale (which is
+  commonly the default locale) will return the system collation locale.
+  The result is suitable for passing to QCollator's constructor.
+
+  \sa QCollator
+*/
+QLocale QLocale::collation() const
+{
+#ifndef QT_NO_SYSTEMLOCALE
+    if (d->m_data == systemData()) {
+        QString res = systemLocale()->query(QSystemLocale::Collation, QVariant()).toString();
+        if (!res.isEmpty())
+            return QLocale(res);
+    }
+#endif
+    return *this;
+}
+
+/*!
     \since 4.8
 
     Returns a native name of the language for the locale. For example