Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227

1 files changed, 36 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
index 124e3cdf00..f76f3aa0c6 100644
--- a/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
+++ b/tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
@@ -34,6 +34,8 @@
 #include <sstream>
 #include <algorithm>
 
+#include <unordered_set>
+
 class tst_QHashFunctions : public QObject
 {
     Q_OBJECT
@@ -59,6 +61,8 @@ private Q_SLOTS:
     void range();
     void rangeCommutative();
 
+    void stdHash();
+
     void setGlobalQHashSeed();
 };
 
@@ -281,6 +285,38 @@ void tst_QHashFunctions::rangeCommutative()
     (void)qHashRangeCommutative(hashables, hashables + numHashables, seed);
 }
 
+void tst_QHashFunctions::stdHash()
+{
+    {
+        std::unordered_set<QString> s = {QStringLiteral("Hello"), QStringLiteral("World")};
+        QCOMPARE(s.size(), 2UL);
+        s.insert(QStringLiteral("Hello"));
+        QCOMPARE(s.size(), 2UL);
+    }
+
+    {
+        std::unordered_set<QStringView> s = {QStringLiteral("Hello"), QStringLiteral("World")};
+        QCOMPARE(s.size(), 2UL);
+        s.insert(QStringLiteral("Hello"));
+        QCOMPARE(s.size(), 2UL);
+    }
+
+    {
+        std::unordered_set<QLatin1String> s = {QLatin1String("Hello"), QLatin1String("World")};
+        QCOMPARE(s.size(), 2UL);
+        s.insert(QLatin1String("Hello"));
+        QCOMPARE(s.size(), 2UL);
+    }
+
+    {
+        std::unordered_set<QByteArray> s = {QByteArrayLiteral("Hello"), QByteArrayLiteral("World")};
+        QCOMPARE(s.size(), 2UL);
+        s.insert(QByteArray("Hello"));
+        QCOMPARE(s.size(), 2UL);
+    }
+
+}
+
 void tst_QHashFunctions::setGlobalQHashSeed()
 {
     // Setter works as advertised