1 files changed, 22 insertions, 17 deletions

diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index 61574ba44f..0cbfa6710c 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
 class QDataStream;
 class QDate;
 class QDateTime;
+class QLocale;
 class QTime;
 class QVariant;
 class QTextStream;
@@ -52,6 +53,8 @@ class QTextStreamPrivate;
 
 class QLocalePrivate;
 
+Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed = 0) Q_DECL_NOTHROW;
+
 class Q_CORE_EXPORT QLocale
 {
     Q_GADGET
@@ -868,23 +871,23 @@ public:
     QString nativeLanguageName() const;
     QString nativeCountryName() const;
 
-    short toShort(const QString &s, bool *ok = 0) const;
-    ushort toUShort(const QString &s, bool *ok = 0) const;
-    int toInt(const QString &s, bool *ok = 0) const;
-    uint toUInt(const QString &s, bool *ok = 0) const;
-    qlonglong toLongLong(const QString &s, bool *ok = 0) const;
-    qulonglong toULongLong(const QString &s, bool *ok = 0) const;
-    float toFloat(const QString &s, bool *ok = 0) const;
-    double toDouble(const QString &s, bool *ok = 0) const;
-
-    short toShort(const QStringRef &s, bool *ok = 0) const;
-    ushort toUShort(const QStringRef &s, bool *ok = 0) const;
-    int toInt(const QStringRef &s, bool *ok = 0) const;
-    uint toUInt(const QStringRef &s, bool *ok = 0) const;
-    qlonglong toLongLong(const QStringRef &s, bool *ok = 0) const;
-    qulonglong toULongLong(const QStringRef &s, bool *ok = 0) const;
-    float toFloat(const QStringRef &s, bool *ok = 0) const;
-    double toDouble(const QStringRef &s, bool *ok = 0) const;
+    short toShort(const QString &s, bool *ok = Q_NULLPTR) const;
+    ushort toUShort(const QString &s, bool *ok = Q_NULLPTR) const;
+    int toInt(const QString &s, bool *ok = Q_NULLPTR) const;
+    uint toUInt(const QString &s, bool *ok = Q_NULLPTR) const;
+    qlonglong toLongLong(const QString &s, bool *ok = Q_NULLPTR) const;
+    qulonglong toULongLong(const QString &s, bool *ok = Q_NULLPTR) const;
+    float toFloat(const QString &s, bool *ok = Q_NULLPTR) const;
+    double toDouble(const QString &s, bool *ok = Q_NULLPTR) const;
+
+    short toShort(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+    ushort toUShort(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+    int toInt(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+    uint toUInt(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+    qlonglong toLongLong(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+    qulonglong toULongLong(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+    float toFloat(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+    double toDouble(const QStringRef &s, bool *ok = Q_NULLPTR) const;
 
     QString toString(qlonglong i) const;
     QString toString(qulonglong i) const;
@@ -979,6 +982,8 @@ public:
 private:
     QLocale(QLocalePrivate &dd);
     friend class QLocalePrivate;
+    friend Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed) Q_DECL_NOTHROW;
+
     QSharedDataPointer<QLocalePrivate> d;
 };
 Q_DECLARE_TYPEINFO(QLocale, Q_MOVABLE_TYPE);