2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/android/src/common/qandroidvideorendercontrol.cpp b/src/plugins/android/src/common/qandroidvideorendercontrol.cpp
index 1891e9d10..dfeea33c1 100644
--- a/src/plugins/android/src/common/qandroidvideorendercontrol.cpp
+++ b/src/plugins/android/src/common/qandroidvideorendercontrol.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 #include "qandroidvideorendercontrol.h"
+#include "androidsurfacetexture.h"
 
-#include <QtCore/private/qjni_p.h>
 #include <QAbstractVideoSurface>
 #include <QVideoSurfaceFormat>
 #include <qevent.h>
@@ -50,7 +50,6 @@
 #include <qopenglfunctions.h>
 #include <qopenglshaderprogram.h>
 #include <qopenglframebufferobject.h>
-#include <QtCore/private/qjnihelpers_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -175,7 +174,7 @@ bool QAndroidVideoRendererControl::initSurfaceTexture()
         return false;
     }
 
-    m_surfaceTexture = new JSurfaceTexture(m_externalTex);
+    m_surfaceTexture = new AndroidSurfaceTexture(m_externalTex);
 
     if (m_surfaceTexture->object()) {
         connect(m_surfaceTexture, SIGNAL(frameAvailable()), this, SLOT(onFrameAvailable()));
diff --git a/src/plugins/android/src/common/qandroidvideorendercontrol.h b/src/plugins/android/src/common/qandroidvideorendercontrol.h
index 75fd7ef12..83d57a437 100644
--- a/src/plugins/android/src/common/qandroidvideorendercontrol.h
+++ b/src/plugins/android/src/common/qandroidvideorendercontrol.h
@@ -45,13 +45,13 @@
 #include <qvideorenderercontrol.h>
 #include <qmutex.h>
 #include "qandroidvideooutput.h"
-#include "jsurfacetexture.h"
 
 QT_BEGIN_NAMESPACE
 
 class QOpenGLTexture;
 class QOpenGLFramebufferObject;
 class QOpenGLShaderProgram;
+class AndroidSurfaceTexture;
 
 class OpenGLResourcesDeleter : public QObject
 {
@@ -113,7 +113,7 @@ private:
     QSize m_nativeSize;
 
     QJNIObjectPrivate *m_androidSurface;
-    JSurfaceTexture *m_surfaceTexture;
+    AndroidSurfaceTexture *m_surfaceTexture;
     QJNIObjectPrivate *m_surfaceHolder;
 
     quint32 m_externalTex;