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.h | |
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.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsglcontext.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/windows/qwindowsglcontext.h b/src/plugins/platforms/windows/qwindowsglcontext.h index c5edd8978f..0bf8ffbbc5 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.h +++ b/src/plugins/platforms/windows/qwindowsglcontext.h @@ -45,8 +45,8 @@ #include "array.h" #include "qtwindows_additional.h" -#include <QtGui/QPlatformGLContext> -#include <QtGui/QGuiGLContext> +#include <QtGui/QPlatformOpenGLContext> +#include <QtGui/QOpenGLContext> #include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE @@ -125,13 +125,13 @@ public: QDebug operator<<(QDebug d, const QOpenGLStaticContext &); -class QWindowsGLContext : public QPlatformGLContext +class QWindowsGLContext : public QPlatformOpenGLContext { public: typedef QSharedPointer<QOpenGLStaticContext> QOpenGLStaticContextPtr; explicit QWindowsGLContext(const QOpenGLStaticContextPtr &staticContext, - QGuiGLContext *context); + QOpenGLContext *context); virtual ~QWindowsGLContext(); bool isValid() const { return m_renderingContext; } virtual QSurfaceFormat format() const { return m_obtainedFormat; } @@ -151,7 +151,7 @@ private: inline void releaseDCs(); const QOpenGLStaticContextPtr m_staticContext; - QGuiGLContext *m_context; + QOpenGLContext *m_context; QSurfaceFormat m_obtainedFormat; HGLRC m_renderingContext; Array<QOpenGLContextData> m_windowContexts; |