diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 18:26:21 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 18:26:22 +0100 |
commit | 6620045fcaada61a2897195f32c0ee35beebc37b (patch) | |
tree | 1a4027d021c10999bc1ff3ad9dc6e17ebb57dfc6 /src/network/ssl | |
parent | 9baf824e4df5e9bc58b4fa1dc86e9a2e0d396ebb (diff) | |
parent | 0649afd60c4d81fd8a6904d4e32737c647af578f (diff) |
Merge dev into 5.7
Change-Id: I5c60b4d9fd8355ddd49a01e21861f36afbbf889b
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 0cc08b9fcc..f9bb28e033 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -664,10 +664,7 @@ QList<QSslCertificate> QSslConfiguration::systemCaCertificates() */ void QSslConfiguration::setSslOption(QSsl::SslOption option, bool on) { - if (on) - d->sslOptions |= option; - else - d->sslOptions &= ~option; + d->sslOptions.setFlag(option, on); } /*! |