diff options
| author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-07-20 08:33:36 (GMT) |
|---|---|---|
| committer | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-07-20 08:41:25 (GMT) |
| commit | b0998a44a5dc384a6cf65c1d5910cb3dd40620cf (patch) | |
| tree | 3617794fcc6858661d37bb5e9fecc5351eb9e5d1 /src/network | |
| parent | 39721ae5cce44c3ea77d96a47d60aff54a91ad5c (diff) | |
| download | Qt-b0998a44a5dc384a6cf65c1d5910cb3dd40620cf.zip Qt-b0998a44a5dc384a6cf65c1d5910cb3dd40620cf.tar.gz Qt-b0998a44a5dc384a6cf65c1d5910cb3dd40620cf.tar.bz2 | |
Qt does not build with qt_namespace on macos
The problem was that the QT_BEGIN_NAMESPACE was in the wrong place.
I moved it 10 lines before and the problem is gone.
Task-number: QTBUG-12262
Reviewed-by: Prasanth
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index c297eea..b4d030c 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -59,6 +59,8 @@ #include <QtCore/qvarlengtharray.h> #include <QLibrary> // for loading the security lib for the CA store +QT_BEGIN_NAMESPACE + #if defined(Q_OS_MAC) #define kSecTrustSettingsDomainSystem 2 // so we do not need to include the header file PtrSecCertificateGetData QSslSocketPrivate::ptrSecCertificateGetData = 0; @@ -72,8 +74,6 @@ #include <QtCore/private/qcore_symbian_p.h> #endif -QT_BEGIN_NAMESPACE - bool QSslSocketPrivate::s_libraryLoaded = false; bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; |