diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-04-30 12:31:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 15:30:16 +0200 |
| commit | 469f9a0c077cedaffafee55a4889dd878bfb2b5d (patch) | |
| tree | 5d4c2cb0e40e1579abf6138728baa6ff926ae33c /src/plugins/android/src/qandroidmediaserviceplugin.cpp | |
| parent | 1d6872ae9c2de1ae7501c375b4960b1ac9374693 (diff) | |
Android: Fix namespace usage.
Make it possible to build multimedia with a Qt namespace
Change-Id: Ibaeaf7edb38f8d784b8d0fcb9a26ca712488c23b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/android/src/qandroidmediaserviceplugin.cpp')
| -rw-r--r-- | src/plugins/android/src/qandroidmediaserviceplugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp index 0af43210f..6c1515308 100644 --- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp +++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp @@ -147,9 +147,11 @@ int QAndroidMediaServicePlugin::cameraOrientation(const QByteArray &device) cons return QAndroidCameraInfoControl::orientation(device); } +QT_END_NAMESPACE Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) { + QT_USE_NAMESPACE typedef union { JNIEnv *nativeEnvironment; void *venv; @@ -173,5 +175,3 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/) return JNI_VERSION_1_4; } - -QT_END_NAMESPACE |