diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-04-23 16:10:33 +0200 |
|---|---|---|
| committer | Christian Stromme <christian.stromme@digia.com> | 2014-06-30 16:58:43 +0200 |
| commit | 8f96ce37333b3034f2eef1366f9eea4a47a479ed (patch) | |
| tree | 9b536c1f9639b6ad092eb99416205b7735cda6d7 /src/network/ssl | |
| parent | 32514298131f7e8009a7641e20ff37be91cf4582 (diff) | |
Android: Fix namespace usage
This change makes it possible to set a Qt namespace for Android builds.
Change-Id: I79f4ae8200223f36f97e2849aae49e45b8850d23
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_android.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_android.cpp b/src/network/ssl/qsslsocket_openssl_android.cpp index fa612a75a6..c7cf03d86d 100644 --- a/src/network/ssl/qsslsocket_openssl_android.cpp +++ b/src/network/ssl/qsslsocket_openssl_android.cpp @@ -153,6 +153,8 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) return JNI_VERSION_1_4; } +QT_BEGIN_NAMESPACE + QList<QByteArray> QSslSocketPrivate::fetchSslCertificateData() { QList<QByteArray> certificateData; @@ -177,3 +179,5 @@ QList<QByteArray> QSslSocketPrivate::fetchSslCertificateData() return certificateData; } + +QT_END_NAMESPACE |