diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-04-30 16:09:05 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-01 12:38:07 +0200 |
commit | 2149b650ea1f4efb174a8559a4621c467492e4a0 (patch) | |
tree | aa09b40bf7ae1fa40cdd1dbfaef78b98974d4222 /src/network/ssl/qsslsocket_openssl.cpp | |
parent | 9420a7da7aedfd08a80b38ae187c89195954e02d (diff) |
Fixed compile of QSslSocket with -qtnamespace on Windows.
Q_DECLARE_METATYPE must be outside of the qt namespace.
System headers must be included outside of the qt namespace.
Change-Id: I2f48b1df87e5edae2baee6ce813af08d3e011dc0
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
-rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 2247148d31..bac837e62f 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -60,6 +60,10 @@ #include <QtCore/qvarlengtharray.h> #include <QLibrary> // for loading the security lib for the CA store +#ifdef Q_OS_WIN +Q_DECLARE_METATYPE(QSslCertificate); +#endif + QT_BEGIN_NAMESPACE #if defined(Q_OS_MAC) && !defined(Q_OS_IOS) @@ -1340,8 +1344,6 @@ void QSslSocketBackendPrivate::_q_caRootLoaded(QSslCertificate cert, QSslCertifi continueHandshake(); } -Q_DECLARE_METATYPE(QSslCertificate); - class QWindowsCaRootFetcherThread : public QThread { public: |