diff options
| author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-07-20 08:33:36 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-22 02:52:15 (GMT) |
| commit | ff66e4d1dfc9642a6ddc4b2dc596e8f2063ade39 (patch) | |
| tree | e39fd0bacd4c27c52626d4a8dd09d55bc7576e41 /src/network | |
| parent | a4cddbb9265e451b89067199001ee2124d833cbb (diff) | |
| download | Qt-ff66e4d1dfc9642a6ddc4b2dc596e8f2063ade39.zip Qt-ff66e4d1dfc9642a6ddc4b2dc596e8f2063ade39.tar.gz Qt-ff66e4d1dfc9642a6ddc4b2dc596e8f2063ade39.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
(cherry picked from commit b0998a44a5dc384a6cf65c1d5910cb3dd40620cf)
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 a7340ea..f181206 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; |