diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-12 20:08:56 +0200 |
| commit | 94c576cf6607d3e9880fdaf6c8a51216bf2d2147 (patch) | |
| tree | 32e42bdb8bcb869c894023f9494c2e2df310d585 /src/plugins/platforms/android/qandroidplatformopenglcontext.cpp | |
| parent | 2ad7f6ddf5042d7442c97a89b083ca2853cf5721 (diff) | |
| parent | e893e657e5c976f96e7e627ca90531934129bf4b (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I3bd83a839b16822035ed56a5cffe77bd6bc3f08d
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformopenglcontext.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformopenglcontext.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp b/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp index 89ac0cbd93..8d98882e9e 100644 --- a/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp +++ b/src/plugins/platforms/android/qandroidplatformopenglcontext.cpp @@ -69,10 +69,7 @@ void QAndroidPlatformOpenGLContext::swapBuffers(QPlatformSurface *surface) bool QAndroidPlatformOpenGLContext::makeCurrent(QPlatformSurface *surface) { - bool ret = QEGLPlatformContext::makeCurrent(surface); - QOpenGLContextPrivate *ctx_d = QOpenGLContextPrivate::get(context()); - - return ret; + return QEGLPlatformContext::makeCurrent(surface); } EGLSurface QAndroidPlatformOpenGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface) |