Android: Fix QtSurfaceTexture
authorChristian Strømme <christian.stromme@digia.com>
Wed, 19 Mar 2014 12:48:19 +0000 (13:48 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 27 Mar 2014 15:44:06 +0000 (16:44 +0100)
commitcc41c7df3ca3daf3fe7e9ef3e1d74ca96724d821
tree61d08693c8053364cfc121217c3f930384a2273e
parent3c3e2c324b9030570588b29f962a3e34bc48be1c
Android: Fix QtSurfaceTexture

Don't extend SurfaceTexture as this causes ART to fail when it doesn't
find the postEventFromNative() function. The postEventFromNative()
function was implemented sometime after API 11, so to avoid this
situation we can use composition instead.

Task-number: QTBUG-37605

Change-Id: Ie1013d218291ba0035f1bb18a0c0655fd2170bfd
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
src/plugins/android/jar/jar.pri
src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener.java [moved from src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtSurfaceTexture.java with 90% similarity]
src/plugins/android/src/common/qandroidvideorendercontrol.cpp
src/plugins/android/src/common/qandroidvideorendercontrol.h
src/plugins/android/src/qandroidmediaserviceplugin.cpp
src/plugins/android/src/wrappers/jsurfacetexture.cpp
src/plugins/android/src/wrappers/jsurfacetexture.h
src/plugins/android/src/wrappers/jsurfacetextureholder.cpp [deleted file]
src/plugins/android/src/wrappers/jsurfacetextureholder.h [deleted file]
src/plugins/android/src/wrappers/wrappers.pri