Merge remote-tracking branch 'origin/12.0'

Change-Id: I6309a8ffb18e40a581301bd275390395e250543c
This commit is contained in:
Eike Ziller
2023-10-26 14:28:02 +02:00
30 changed files with 267 additions and 113 deletions

View File

@@ -158,12 +158,15 @@ bool AxivionPlugin::handleCertificateIssue()
AxivionPluginPrivate::AxivionPluginPrivate()
{
#if QT_CONFIG(ssl)
connect(&m_networkAccessManager, &QNetworkAccessManager::sslErrors,
this, &AxivionPluginPrivate::handleSslErrors);
#endif // ssl
}
void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
{
#if QT_CONFIG(ssl)
const QList<QSslError::SslError> accepted{
QSslError::CertificateNotYetValid, QSslError::CertificateExpired,
QSslError::InvalidCaCertificate, QSslError::CertificateUntrusted,
@@ -174,6 +177,10 @@ void AxivionPluginPrivate::handleSslErrors(QNetworkReply *reply, const QList<QSs
if (!settings().server.validateCert || AxivionPlugin::handleCertificateIssue())
reply->ignoreSslErrors(errors);
}
#else // ssl
Q_UNUSED(reply)
Q_UNUSED(errors)
#endif // ssl
}
void AxivionPluginPrivate::onStartupProjectChanged()