diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-15 01:00:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-15 01:00:11 +0100 |
| commit | 8264e495fa9220c101a8a913701a0b8834a6d58b (patch) | |
| tree | 069aa1d3efab926991c1edfc5b69a3d9e58dcfba /src/network/ssl/qsslconfiguration.h | |
| parent | 80f52812f2651e6d427bb3dd2e338b60fb25d48b (diff) | |
| parent | 8eb3944dac81b8c51d7bac7784204d457551b50c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8b5a10d897a926078895ae41f48cdbd2474902b8
Diffstat (limited to 'src/network/ssl/qsslconfiguration.h')
| -rw-r--r-- | src/network/ssl/qsslconfiguration.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index b3264126dd..a5561d9828 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -150,9 +150,9 @@ public: QSslDiffieHellmanParameters diffieHellmanParameters() const; void setDiffieHellmanParameters(const QSslDiffieHellmanParameters &dhparams); - QMap<QByteArray, QVariant> backendConfig() const; - void setBackendConfigOption(const QByteArray &name, const QVariant &value); - void setBackendConfig(const QMap<QByteArray, QVariant> &backendConfig = QMap<QByteArray, QVariant>()); + QMap<QByteArray, QVariant> backendConfiguration() const; + void setBackendConfigurationOption(const QByteArray &name, const QVariant &value); + void setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfig = QMap<QByteArray, QVariant>()); static QSslConfiguration defaultConfiguration(); static void setDefaultConfiguration(const QSslConfiguration &configuration); |