summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2018-04-24 10:00:03 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-04-25 04:18:48 +0000
commit8c57663ed21855ad6b888bd01785b7f4e9251ae6 (patch)
tree31ed5c7fdcecfc4a7fe4fcd2057c1bffe7a93cda /src
parentcf204590ea94bb3a191b5e783471bd6f5a04ab8e (diff)
Fix documentation of setBackendConfigurationOption
Introduced by mistake in f55c73ede28d4455f555a28e401407326ac9b954 Change-Id: Ieac8fc0a6bb536e5ef3770a22785fe41d4033ee9 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/network/ssl/qsslconfiguration.cpp8
-rw-r--r--src/network/ssl/qsslconfiguration.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index 116a6693c4..1071662d96 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -876,7 +876,7 @@ void QSslConfiguration::setDiffieHellmanParameters(const QSslDiffieHellmanParame
Returns the backend-specific configuration.
- Only options set by addBackendConfiguration() or setBackendConfiguration() will be
+ Only options set by setBackendConfigurationOption() or setBackendConfiguration() will be
returned. The internal standard configuration of the backend is not reported.
\sa setBackendConfigurationOption(), setBackendConfiguration()
@@ -916,13 +916,13 @@ void QSslConfiguration::setBackendConfigurationOption(const QByteArray &name, co
Without a \a backendConfiguration parameter this function will clear the
backend-specific configuration. More information about the supported
- options is available in the documentation of addBackendConfiguration().
+ options is available in the documentation of setBackendConfigurationOption().
\sa backendConfiguration(), setBackendConfigurationOption()
*/
-void QSslConfiguration::setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfig)
+void QSslConfiguration::setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfiguration)
{
- d->backendConfig = backendConfig;
+ d->backendConfig = backendConfiguration;
}
/*!
diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h
index a5561d9828..fe4181d755 100644
--- a/src/network/ssl/qsslconfiguration.h
+++ b/src/network/ssl/qsslconfiguration.h
@@ -152,7 +152,7 @@ public:
QMap<QByteArray, QVariant> backendConfiguration() const;
void setBackendConfigurationOption(const QByteArray &name, const QVariant &value);
- void setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfig = QMap<QByteArray, QVariant>());
+ void setBackendConfiguration(const QMap<QByteArray, QVariant> &backendConfiguration = QMap<QByteArray, QVariant>());
static QSslConfiguration defaultConfiguration();
static void setDefaultConfiguration(const QSslConfiguration &configuration);