diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-08-01 11:52:05 +0200 |
| commit | 339944b284e9dd11302dd013f9d9a10ad0d9055a (patch) | |
| tree | c2952d186b1dbc6f2380448fa2cfd9ec55043da6 /src/plugins/android/src/wrappers/jni/androidsurfacetexture.h | |
| parent | 53d0a1e5454f4e5beecdea19acb9df11c87cc375 (diff) | |
| parent | d7d31d63db5f0029a4a5e24d998601baee8bade0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic29cb09048003f18ff86d4546cd547be715eaec8
Diffstat (limited to 'src/plugins/android/src/wrappers/jni/androidsurfacetexture.h')
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidsurfacetexture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h index b45ee384c..0a271287a 100644 --- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h +++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h @@ -54,7 +54,6 @@ public: explicit AndroidSurfaceTexture(unsigned int texName); ~AndroidSurfaceTexture(); - int textureID() const { return m_texID; } jobject surfaceTexture(); jobject surface(); jobject surfaceHolder(); @@ -73,7 +72,8 @@ Q_SIGNALS: void frameAvailable(); private: - int m_texID; + void setOnFrameAvailableListener(const QJNIObjectPrivate &listener); + QJNIObjectPrivate m_surfaceTexture; QJNIObjectPrivate m_surface; QJNIObjectPrivate m_surfaceHolder; |