diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 19:15:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 19:15:23 (GMT) |
| commit | 1af842ec8bcf2e86453f964464fb3770a6025146 (patch) | |
| tree | 147672121104baea3ea3b6c8aa88733011c14f44 /src/network/ssl/qsslsocket_openssl_p.h | |
| parent | 7a81735272b5ee065f499a492cca4b4a703e0659 (diff) | |
| parent | 540d5bde104dd924b24850c0ed8e8ee285b6ec69 (diff) | |
| download | Qt-1af842ec8bcf2e86453f964464fb3770a6025146.zip Qt-1af842ec8bcf2e86453f964464fb3770a6025146.tar.gz Qt-1af842ec8bcf2e86453f964464fb3770a6025146.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:
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
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 b59a6c9..878c654 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -117,6 +117,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); + static QString getErrorsFromOpenSsl(); }; #if defined(Q_OS_SYMBIAN) |