diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-09-30 08:55:26 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-09-30 08:55:26 (GMT) |
| commit | a3a5566678256a029893fdfbc0c977e68bb61f2e (patch) | |
| tree | ee09839c6ce95645da511c5ebd91d19586649976 /src/plugins/platforms/eglconvenience/qeglplatformcontext.h | |
| parent | 7e6bf4a06e6f2e8e3a25d1212be766e2e753347a (diff) | |
| parent | 1f459f4040845919ffd46cea35958486f41abb3c (diff) | |
| download | Qt-a3a5566678256a029893fdfbc0c977e68bb61f2e.zip Qt-a3a5566678256a029893fdfbc0c977e68bb61f2e.tar.gz Qt-a3a5566678256a029893fdfbc0c977e68bb61f2e.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'src/plugins/platforms/eglconvenience/qeglplatformcontext.h')
| -rw-r--r-- | src/plugins/platforms/eglconvenience/qeglplatformcontext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h index 9be1480..614b3cb 100644 --- a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h +++ b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h @@ -48,7 +48,7 @@ class QEGLPlatformContext : public QPlatformGLContext { public: - QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi); + QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi, QEGLPlatformContext *shareContext = 0); ~QEGLPlatformContext(); void makeCurrent(); |