diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2013-09-12 13:14:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 10:11:50 +0200 |
| commit | ac029c65f273ce5dd20da8e84d1bcff2fd6749d4 (patch) | |
| tree | 17299491d3020145ad7273cdb50372a1c03d4765 /src/plugins/android/src/common | |
| parent | 17480111ed3e98c3d10c2fb9590c3c487e3e952c (diff) | |
Android: Adapt the multimedia plugin to new QJNI API
Change-Id: Id87f5518724eed6c9de6d5d3b8141860bd511643
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/android/src/common')
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideorendercontrol.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/android/src/common/qandroidvideorendercontrol.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/android/src/common/qandroidvideorendercontrol.cpp b/src/plugins/android/src/common/qandroidvideorendercontrol.cpp index c5d38aebe..0eb8d172f 100644 --- a/src/plugins/android/src/common/qandroidvideorendercontrol.cpp +++ b/src/plugins/android/src/common/qandroidvideorendercontrol.cpp @@ -41,7 +41,7 @@ #include "qandroidvideorendercontrol.h" -#include <QtPlatformSupport/private/qjnihelpers_p.h> +#include <QtCore/private/qjni_p.h> #include "jsurfacetextureholder.h" #include <QAbstractVideoSurface> #include <QOpenGLContext> @@ -268,7 +268,7 @@ jobject QAndroidVideoRendererControl::surfaceHolder() return 0; if (!m_surfaceHolder) { - m_androidSurface = new QJNIObject("android/view/Surface", + m_androidSurface = new QJNIObjectPrivate("android/view/Surface", "(Landroid/graphics/SurfaceTexture;)V", m_surfaceTexture->object()); diff --git a/src/plugins/android/src/common/qandroidvideorendercontrol.h b/src/plugins/android/src/common/qandroidvideorendercontrol.h index d8078f075..25220310e 100644 --- a/src/plugins/android/src/common/qandroidvideorendercontrol.h +++ b/src/plugins/android/src/common/qandroidvideorendercontrol.h @@ -90,7 +90,7 @@ private: bool m_useImage; QSize m_nativeSize; - QJNIObject *m_androidSurface; + QJNIObjectPrivate *m_androidSurface; JSurfaceTexture *m_surfaceTexture; JSurfaceTextureHolder *m_surfaceHolder; uint m_externalTex; |