3 files changed, 6 insertions, 2 deletions
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index acb8d70d09..224ef9db8f 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -95,9 +95,9 @@
 #include "qsslsocket.h"
 #ifndef QT_NO_DEBUG_STREAM
 #include <QtCore/qdebug.h>
+#endif
 
 QT_BEGIN_NAMESPACE
-#endif
 
 class QSslErrorPrivate
 {
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index bdc9c4b4cf..aa16425e9a 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -220,7 +220,7 @@ private:
 
 QT_END_NAMESPACE
 
-#ifndef QT_NO_OPENSSL
+#ifndef QT_NO_SSL
 Q_DECLARE_METATYPE(QList<QSslError>)
 #endif
 
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index f62f3c1229..20ad82407c 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -1384,6 +1384,10 @@ QList<QSslError> QSslSocketBackendPrivate::verify(QList<QSslCertificate> certifi
         return errors;
     }
 
+    if (s_loadRootCertsOnDemand) {
+        setDefaultCaCertificates(defaultCaCertificates() + systemCaCertificates());
+    }
+
     QList<QSslCertificate> expiredCerts;
 
     foreach (const QSslCertificate &caCertificate, QSslSocket::defaultCaCertificates()) {