diff options
author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-26 17:32:02 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-28 15:38:54 +0200 |
commit | 61c6f64872a363cbde209e6f9a7cd05e79713c93 (patch) | |
tree | 6a210cbe929997183276a09a81dc7465d7d15d41 /src/plugins/platforms/eglconvenience/qeglplatformcontext.h | |
parent | ef77e8b65149a29a541044239fccf5e14b95e94d (diff) |
Dont call QPlatformGLContext::makeCurrent from subclass
(cherry picked from commit fc0a6ab220ab97b8f6acf90bf04b46de513a4d96)
Diffstat (limited to 'src/plugins/platforms/eglconvenience/qeglplatformcontext.h')
-rw-r--r-- | src/plugins/platforms/eglconvenience/qeglplatformcontext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h index 69835d7eb4..048fd72215 100644 --- a/src/plugins/platforms/eglconvenience/qeglplatformcontext.h +++ b/src/plugins/platforms/eglconvenience/qeglplatformcontext.h @@ -56,7 +56,7 @@ public: void swapBuffers(); void* getProcAddress(const QString& procName); - QPlatformWindowFormat platformWindowFormat() const; + QWindowFormat windowFormat() const; EGLContext eglContext() const; private: @@ -65,7 +65,7 @@ private: EGLSurface m_eglSurface; EGLenum m_eglApi; - QPlatformWindowFormat m_windowFormat; + QWindowFormat m_windowFormat; }; #endif //QOPENKODEGLINTEGRATION_H |