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/wrappers/jmediaplayer.cpp | |
| parent | 1d6872ae9c2de1ae7501c375b4960b1ac9374693 (diff) | |
| download | qtmultimedia-469f9a0c077cedaffafee55a4889dd878bfb2b5d.tar.gz | |
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/wrappers/jmediaplayer.cpp')
| -rw-r--r-- | src/plugins/android/src/wrappers/jmediaplayer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/android/src/wrappers/jmediaplayer.cpp b/src/plugins/android/src/wrappers/jmediaplayer.cpp index de86cd041..98ccbfd5a 100644 --- a/src/plugins/android/src/wrappers/jmediaplayer.cpp +++ b/src/plugins/android/src/wrappers/jmediaplayer.cpp @@ -155,8 +155,6 @@ void JMediaPlayer::setDisplay(jobject surfaceHolder) mMediaPlayer.callMethod<void>("setDisplay", "(Landroid/view/SurfaceHolder;)V", surfaceHolder); } -QT_END_NAMESPACE - static void onErrorNative(JNIEnv *env, jobject thiz, jint what, jint extra, jlong id) { Q_UNUSED(env); @@ -238,8 +236,6 @@ static void onVideoSizeChangedNative(JNIEnv *env, Q_EMIT mp->videoSizeChanged(width, height); } -QT_BEGIN_NAMESPACE - bool JMediaPlayer::initJNI(JNIEnv *env) { jclass jClass = env->FindClass("org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer"); |