Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index 67cbd5059f..49ff1b48fe 100644
--- a/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
@@ -70,6 +70,7 @@ public slots:
 
 #ifndef QT_NO_SSL
 private slots:
+    void hash();
     void emptyConstructor();
     void constructor_data();
     void constructor();
@@ -164,6 +165,14 @@ void tst_QSslCertificate::cleanupTestCase()
 
 #ifndef QT_NO_SSL
 
+void tst_QSslCertificate::hash()
+{
+    // mostly a compile-only test, to check that qHash(QSslCertificate) is found.
+    QSet<QSslCertificate> certs;
+    certs << QSslCertificate();
+    QCOMPARE(certs.size(), 1);
+}
+
 static QByteArray readFile(const QString &absFilePath)
 {
     QFile file(absFilePath);