diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-20 15:50:20 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-20 15:50:20 (GMT) |
| commit | 79a5babcd2fdee3aca7fb6b13d9eddd2ec130581 (patch) | |
| tree | 48146ff0a0dc09ad80b317df83e3ec646c229aa3 /src/network/ssl/qsslcertificate.h | |
| parent | e93ffdbb6fde611defc34fd27aec25c40da5a60e (diff) | |
| parent | 63a6395e6bd24a3bd11425c6a978a111f53ebf99 (diff) | |
| download | Qt-79a5babcd2fdee3aca7fb6b13d9eddd2ec130581.zip Qt-79a5babcd2fdee3aca7fb6b13d9eddd2ec130581.tar.gz Qt-79a5babcd2fdee3aca7fb6b13d9eddd2ec130581.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/network/ssl/qsslcertificate.h')
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index a62412e..d664434 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -47,6 +47,7 @@ #include <QtCore/qbytearray.h> #include <QtCore/qcryptographichash.h> #include <QtCore/qregexp.h> +#include <QtCore/qsharedpointer.h> #include <QtNetwork/qssl.h> typedef struct x509_st X509; // ### check if this works @@ -118,7 +119,7 @@ public: Qt::HANDLE handle() const; private: - QScopedSharedPointer<QSslCertificatePrivate> d; + QExplicitlySharedDataPointer<QSslCertificatePrivate> d; friend class QSslCertificatePrivate; friend class QSslSocketBackendPrivate; }; |