diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-22 10:49:28 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:24 +0200 |
| commit | 6e28e8441b698c3397c2c78125c877f2e9867cb1 (patch) | |
| tree | 1e3ad0e43cb775854835817cd04bdc8b5e047e15 /src/plugins/platforms/windows/qwindowsglcontext.cpp | |
| parent | aaa4a26f82f99fa8724841eba91bad029306e0ce (diff) | |
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.
Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsglcontext.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsglcontext.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index e94b4ffdf2..4abccfb416 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -778,7 +778,7 @@ QDebug operator<<(QDebug d, const QOpenGLStaticContext &s) */ QWindowsGLContext::QWindowsGLContext(const QOpenGLStaticContextPtr &staticContext, - QGuiGLContext *context) : + QOpenGLContext *context) : m_staticContext(staticContext), m_context(context), m_pixelFormat(0), m_extensionsUsed(false) @@ -843,7 +843,7 @@ QWindowsGLContext::QWindowsGLContext(const QOpenGLStaticContextPtr &staticContex } // Create context with sharing, again preferably using ARB. HGLRC sharingRenderingContext = 0; - if (const QPlatformGLContext *sc = context->shareHandle()) + if (const QPlatformOpenGLContext *sc = context->shareHandle()) sharingRenderingContext = static_cast<const QWindowsGLContext *>(sc)->renderingContext(); if (m_extensionsUsed) |