diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-12-10 11:01:29 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2016-01-18 08:33:04 +0000 |
| commit | bfd367c6ec37c9d883c51316a149447b63005011 (patch) | |
| tree | 362eede2404c6c3377bcb75cbfb9041c3231e653 /src/plugins/platforms/mirclient/qmirclientglcontext.h | |
| parent | 1172e18c3c180f2f3641e6c29688199eb5c46650 (diff) | |
Mirclient: update with upstream changes
Merge in the changes up to revision 306 of the lp:qtubuntu repo.
Change-Id: I55dcb9e06e0a3503d6abe4b0894d5ef5a785b6bb
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/mirclient/qmirclientglcontext.h')
| -rw-r--r-- | src/plugins/platforms/mirclient/qmirclientglcontext.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/mirclient/qmirclientglcontext.h b/src/plugins/platforms/mirclient/qmirclientglcontext.h index cc40298259..29c196ce5c 100644 --- a/src/plugins/platforms/mirclient/qmirclientglcontext.h +++ b/src/plugins/platforms/mirclient/qmirclientglcontext.h @@ -53,7 +53,7 @@ public: bool makeCurrent(QPlatformSurface* surface) override; void doneCurrent() override; bool isValid() const override { return mEglContext != EGL_NO_CONTEXT; } - void (*getProcAddress(const QByteArray& procName)) (); + void (*getProcAddress(const QByteArray& procName)) () override; EGLContext eglContext() const { return mEglContext; } |