diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-17 17:51:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-02-17 19:57:54 +0000 |
| commit | 86c5a337e3b123f2e41c8b15b416f39655519acd (patch) | |
| tree | efa0f720a190889b3d31ddbd07cee0495b8a15d4 /src/network/ssl | |
| parent | 47ca3f78139ad51a5018dcdad27fa5caf817f08d (diff) | |
| parent | 6620045fcaada61a2897195f32c0ee35beebc37b (diff) | |
Merge "Merge dev into 5.7" into refs/staging/5.7
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); } /*! |