File tree 2 files changed +6
-2
lines changed
2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change 25
25
#include " qgsauthconfig.h"
26
26
27
27
#if QT_VERSION >= 0x050000
28
- #define SSL_ISSUER_INFO ( var, prop ) var.issuerInfo( prop ).first( )
28
+ #define SSL_ISSUER_INFO ( var, prop ) var.issuerInfo( prop ).value( 0 )
29
29
#else
30
30
#define SSL_ISSUER_INFO ( var, prop ) var.issuerInfo( prop )
31
31
#endif
32
32
33
33
#if QT_VERSION >= 0x050000
34
- #define SSL_SUBJECT_INFO ( var, prop ) var.subjectInfo( prop ).first( )
34
+ #define SSL_SUBJECT_INFO ( var, prop ) var.subjectInfo( prop ).value( 0 )
35
35
#else
36
36
#define SSL_SUBJECT_INFO ( var, prop ) var.subjectInfo( prop )
37
37
#endif
Original file line number Diff line number Diff line change @@ -2360,8 +2360,12 @@ bool QgsAuthManager::removeCertAuthority( const QSslCertificate& cert )
2360
2360
2361
2361
const QList<QSslCertificate> QgsAuthManager::getSystemRootCAs ()
2362
2362
{
2363
+ #ifndef Q_OS_MAC
2364
+ return QSslSocket::systemCaCertificates ();
2365
+ #else
2363
2366
QNetworkRequest req;
2364
2367
return req.sslConfiguration ().caCertificates ();
2368
+ #endif
2365
2369
}
2366
2370
2367
2371
const QList<QSslCertificate> QgsAuthManager::getExtraFileCAs ()
You can’t perform that action at this time.
0 commit comments