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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp index df09d0819..764315acd 100644 --- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp +++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp @@ -62,7 +62,7 @@ static void notifyFrameAvailable(JNIEnv* , jobject, jlong id) Q_EMIT obj->frameAvailable(); } -AndroidSurfaceTexture::AndroidSurfaceTexture(unsigned int texName) +AndroidSurfaceTexture::AndroidSurfaceTexture(quint32 texName) : QObject() { Q_STATIC_ASSERT(sizeof (jlong) >= sizeof (void *)); @@ -163,7 +163,7 @@ jobject AndroidSurfaceTexture::surfaceHolder() return m_surfaceHolder.object(); } -void AndroidSurfaceTexture::attachToGLContext(int texName) +void AndroidSurfaceTexture::attachToGLContext(quint32 texName) { if (QtAndroidPrivate::androidSdkVersion() < 16 || !m_surfaceTexture.isValid()) return; |