From 08ec25bedde5d35ffe050d419cee4fcdae734683 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Mon, 16 Nov 2015 17:15:52 +0100
Subject: [PATCH] [auth] fix detection of root CAs on Linux (fixes #13640)

---
 src/core/auth/qgsauthcertutils.h | 4 ++--
 src/core/auth/qgsauthmanager.cpp | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/core/auth/qgsauthcertutils.h b/src/core/auth/qgsauthcertutils.h
index 35b7a933ae1..fcb614c1adf 100644
--- a/src/core/auth/qgsauthcertutils.h
+++ b/src/core/auth/qgsauthcertutils.h
@@ -25,13 +25,13 @@
 #include "qgsauthconfig.h"
 
 #if QT_VERSION >= 0x050000
-#define SSL_ISSUER_INFO( var, prop ) var.issuerInfo( prop ).first()
+#define SSL_ISSUER_INFO( var, prop ) var.issuerInfo( prop ).value(0)
 #else
 #define SSL_ISSUER_INFO( var, prop ) var.issuerInfo( prop )
 #endif
 
 #if QT_VERSION >= 0x050000
-#define SSL_SUBJECT_INFO( var, prop ) var.subjectInfo( prop ).first()
+#define SSL_SUBJECT_INFO( var, prop ) var.subjectInfo( prop ).value(0)
 #else
 #define SSL_SUBJECT_INFO( var, prop ) var.subjectInfo( prop )
 #endif
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
index 65cb1c20535..82155b94a28 100644
--- a/src/core/auth/qgsauthmanager.cpp
+++ b/src/core/auth/qgsauthmanager.cpp
@@ -2360,8 +2360,11 @@ bool QgsAuthManager::removeCertAuthority( const QSslCertificate& cert )
 
 const QList<QSslCertificate> QgsAuthManager::getSystemRootCAs()
 {
-  QNetworkRequest req;
-  return req.sslConfiguration().caCertificates();
+#ifndef Q_OS_MAC
+  return QSslSocket::systemCaCertificates();
+#else
+  return QNetworkRequest::sslConfiguration().caCertificates();
+#endif
 }
 
 const QList<QSslCertificate> QgsAuthManager::getExtraFileCAs()