From 8f96ce37333b3034f2eef1366f9eea4a47a479ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Wed, 23 Apr 2014 16:10:33 +0200 Subject: 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 --- src/network/ssl/qsslsocket_openssl_android.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/network') 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 QSslSocketPrivate::fetchSslCertificateData() { QList certificateData; @@ -177,3 +179,5 @@ QList QSslSocketPrivate::fetchSslCertificateData() return certificateData; } + +QT_END_NAMESPACE -- cgit v1.2.3