Merge remote-tracking branch 'origin/5.4.0' into 5.4

Conflicts:
	dist/changes-5.4.0

7231e1fbe24102f2a93b34dfa70e3dca884440d2 went into 5.4 instead of the
5.4.0 branch, thus the conflict.

Change-Id: I70b8597ab52506490dcaf700427183950d42cbd1

1 files changed, 2 insertions, 2 deletions

diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 13bddcb3ea..125a7a0250 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -575,12 +575,12 @@ QList<QSslError> QSslCertificate::verify(QList<QSslCertificate> certificateChain
 
   \note The \a device must be open and ready to be read from.
  */
-bool QSslCertificate::importPKCS12(QIODevice *device,
+bool QSslCertificate::importPkcs12(QIODevice *device,
                                    QSslKey *key, QSslCertificate *certificate,
                                    QList<QSslCertificate> *caCertificates,
                                    const QByteArray &passPhrase)
 {
-    return QSslSocketBackendPrivate::importPKCS12(device, key, certificate, caCertificates, passPhrase);
+    return QSslSocketBackendPrivate::importPkcs12(device, key, certificate, caCertificates, passPhrase);
 }
 
 // These certificates are known to be fraudulent and were created during the comodo