Merge remote-tracking branch 'origin/5.11.0' into 5.11

Change-Id: Id6e2acd5e31c1ac858ddf1d8873a6f10694141de

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);