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/plugins/platforms/android/androidjnimain.cpp | |
| 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/plugins/platforms/android/androidjnimain.cpp')
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index 948b012399..09c56f398c 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -76,6 +76,8 @@ Q_IMPORT_PLUGIN(QAndroidPlatformIntegrationPlugin) +QT_BEGIN_NAMESPACE + static JavaVM *m_javaVM = NULL; static jclass m_applicationClass = NULL; static jobject m_classLoaderObject = NULL; @@ -748,8 +750,11 @@ static int registerNatives(JNIEnv *env) return JNI_TRUE; } +QT_END_NAMESPACE + Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/) { + QT_USE_NAMESPACE typedef union { JNIEnv *nativeEnvironment; void *venv; |