diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 01:37:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-10 01:37:56 (GMT) |
| commit | 6988f2bb36dafc2223c326b6fd21e49586b1379b (patch) | |
| tree | 36ddaa20020353c998d30a127122cd6c5973d857 /src/network/ssl/qsslsocket_openssl_p.h | |
| parent | 0de5087cf17e1c1c37da166b2f531525b9060d71 (diff) | |
| parent | 1cfb16f694cf5649a8cef11bd096be3b20d06b36 (diff) | |
| download | Qt-6988f2bb36dafc2223c326b6fd21e49586b1379b.zip Qt-6988f2bb36dafc2223c326b6fd21e49586b1379b.tar.gz Qt-6988f2bb36dafc2223c326b6fd21e49586b1379b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
Doc: fixing offline style
Fix handling of SSL certificates with wildcard domain names
Doc: fixing examples link
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
SSL library loading: load system libs only once
Revert "SSL backend: load libraries for certificates only once"
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
Doc: Adding support for Qt Creator style
doc: Fixed last of the declarative/QML qdoc warnings.
qdoc: Marked some missing declarative properties and functions as \internal.
qhelpgenerator: Fix namespace syntax checking.
...
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index e41320d..fd02838 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -116,6 +116,7 @@ public: static QSslCipher QSslCipher_from_SSL_CIPHER(SSL_CIPHER *cipher); static QList<QSslCertificate> STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509); + Q_AUTOTEST_EXPORT static bool isMatchingHostname(const QString &cn, const QString &hostname); }; #if defined(Q_OS_SYMBIAN) |