diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-13 13:53:51 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 13:53:59 +0200 |
commit | 820205e604a5f281238c23464638fdff72b969d1 (patch) | |
tree | c6f6723449d1b11e8d540752e50e3c2e11613f33 /src/plugins/android/src/wrappers/jni/androidsurfacetexture.h | |
parent | 03d55888942feac26054978ce4e7c6edd4611eda (diff) | |
parent | c30eeb5b7486caa31cdb0f9279de2f78fed89c54 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I3204cdf695f4b47730a88a7c41fc7a6de967b161
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 0a271287a..911711774 100644 --- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h +++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.h @@ -51,7 +51,7 @@ class AndroidSurfaceTexture : public QObject { Q_OBJECT public: - explicit AndroidSurfaceTexture(unsigned int texName); + explicit AndroidSurfaceTexture(quint32 texName); ~AndroidSurfaceTexture(); jobject surfaceTexture(); @@ -63,7 +63,7 @@ public: void release(); // API level 14 void updateTexImage(); - void attachToGLContext(int texName); // API level 16 + void attachToGLContext(quint32 texName); // API level 16 void detachFromGLContext(); // API level 16 static bool initJNI(JNIEnv *env); |