forked from qt-creator/qt-creator
Axivion: Support building without ssl
Change-Id: I027317410321725e8e295d236243e50e1ea6019d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -158,12 +158,15 @@ bool AxivionPlugin::handleCertificateIssue()
|
|||||||
|
|
||||||
AxivionPluginPrivate::AxivionPluginPrivate()
|
AxivionPluginPrivate::AxivionPluginPrivate()
|
||||||
{
|
{
|
||||||
|
#if QT_CONFIG(ssl)
|
||||||
connect(&m_networkAccessManager, &QNetworkAccessManager::sslErrors,
|
connect(&m_networkAccessManager, &QNetworkAccessManager::sslErrors,
|
||||||
this, &AxivionPluginPrivate::handleSslErrors);
|
this, &AxivionPluginPrivate::handleSslErrors);
|
||||||
|
#endif // ssl
|
||||||
}
|
}
|
||||||
|
|
||||||
void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
|
void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
|
||||||
{
|
{
|
||||||
|
#if QT_CONFIG(ssl)
|
||||||
const QList<QSslError::SslError> accepted{
|
const QList<QSslError::SslError> accepted{
|
||||||
QSslError::CertificateNotYetValid, QSslError::CertificateExpired,
|
QSslError::CertificateNotYetValid, QSslError::CertificateExpired,
|
||||||
QSslError::InvalidCaCertificate, QSslError::CertificateUntrusted,
|
QSslError::InvalidCaCertificate, QSslError::CertificateUntrusted,
|
||||||
@@ -174,6 +177,10 @@ void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSs
|
|||||||
if (!settings().server.validateCert || AxivionPlugin::handleCertificateIssue())
|
if (!settings().server.validateCert || AxivionPlugin::handleCertificateIssue())
|
||||||
reply->ignoreSslErrors(errors);
|
reply->ignoreSslErrors(errors);
|
||||||
}
|
}
|
||||||
|
#else // ssl
|
||||||
|
Q_UNUSED(reply)
|
||||||
|
Q_UNUSED(errors)
|
||||||
|
#endif // ssl
|
||||||
}
|
}
|
||||||
|
|
||||||
void AxivionPluginPrivate::onStartupProjectChanged()
|
void AxivionPluginPrivate::onStartupProjectChanged()
|
||||||
|
|||||||
Reference in New Issue
Block a user