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/opengl/qgl.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/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<QGLContextPrivate> d_ptr; |