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/qsslkey.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/qsslkey.h')
| -rw-r--r-- | src/network/ssl/qsslkey.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h index 5132dae..d5a85b3 100644 --- a/src/network/ssl/qsslkey.h +++ b/src/network/ssl/qsslkey.h @@ -45,7 +45,7 @@ #include <QtCore/qnamespace.h> #include <QtCore/qbytearray.h> -#include <QtCore/qscopedpointer.h> +#include <QtCore/qsharedpointer.h> #include <QtNetwork/qssl.h> QT_BEGIN_HEADER @@ -59,7 +59,7 @@ QT_MODULE(Network) template <typename A, typename B> struct QPair; class QIODevice; - + class QSslKeyPrivate; class Q_NETWORK_EXPORT QSslKey { @@ -93,7 +93,7 @@ public: inline bool operator!=(const QSslKey &key) const { return !operator==(key); } private: - QScopedSharedPointer<QSslKeyPrivate> d; + QExplicitlySharedDataPointer<QSslKeyPrivate> d; friend class QSslCertificate; }; |