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

Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb

2 files changed, 18 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);
diff --git a/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp b/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
index 58136f9a68..7fd6dc8233 100644
--- a/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
+++ b/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
@@ -64,6 +64,7 @@ public:
 #ifndef QT_NO_SSL
 private slots:
     void constructing();
+    void hash();
 #endif
 
 private:
@@ -79,6 +80,14 @@ void tst_QSslError::constructing()
     QSslError error;
 }
 
+void tst_QSslError::hash()
+{
+    // mostly a compile-only test, to check that qHash(QSslError) is found
+    QSet<QSslError> errors;
+    errors << QSslError();
+    QCOMPARE(errors.size(), 1);
+}
+
 #endif // QT_NO_SSL
 
 QTEST_MAIN(tst_QSslError)