From 6e28e8441b698c3397c2c78125c877f2e9867cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Mon, 22 Aug 2011 10:49:28 +0200 Subject: 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 --- src/opengl/qgl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/opengl/qgl.h') diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index a12cddcca4..665dcac412 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -338,8 +338,8 @@ public: static const QGLContext* currentContext(); - static QGLContext *fromGuiGLContext(QGuiGLContext *platformContext); - QGuiGLContext *contextHandle() const; + static QGLContext *fromOpenGLContext(QOpenGLContext *platformContext); + QOpenGLContext *contextHandle() const; protected: virtual bool chooseContext(const QGLContext* shareContext = 0); @@ -359,7 +359,7 @@ protected: static QGLContext* currentCtx; private: - QGLContext(QGuiGLContext *windowContext); + QGLContext(QOpenGLContext *windowContext); QScopedPointer d_ptr; -- cgit v1.2.3