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/openkode | |
| 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/openkode')
| -rw-r--r-- | src/plugins/platforms/openkode/qopenkodeintegration.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/openkode/qopenkodewindow.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/openkode/qopenkodewindow.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/openkode/qopenkodeintegration.h b/src/plugins/platforms/openkode/qopenkodeintegration.h index fb68e123cc..43961add6d 100644 --- a/src/plugins/platforms/openkode/qopenkodeintegration.h +++ b/src/plugins/platforms/openkode/qopenkodeintegration.h @@ -48,7 +48,7 @@ #include <QtGui/QPlatformIntegration> #include <QtGui/QPlatformScreen> -#include <QtGui/QPlatformGLContext> +#include <QtGui/QPlatformOpenGLContext> #include <QtGui/QPlatformFontDatabase> #include <GLES2/gl2.h> diff --git a/src/plugins/platforms/openkode/qopenkodewindow.cpp b/src/plugins/platforms/openkode/qopenkodewindow.cpp index 2215cd0a92..e20904470f 100644 --- a/src/plugins/platforms/openkode/qopenkodewindow.cpp +++ b/src/plugins/platforms/openkode/qopenkodewindow.cpp @@ -235,7 +235,7 @@ WId QOpenKODEWindow::winId() const return i++; } -QPlatformGLContext *QOpenKODEWindow::glContext() const +QPlatformOpenGLContext *QOpenKODEWindow::glContext() const { return m_platformGlContext; } diff --git a/src/plugins/platforms/openkode/qopenkodewindow.h b/src/plugins/platforms/openkode/qopenkodewindow.h index 317a6b5cd6..f48c3a2bc0 100644 --- a/src/plugins/platforms/openkode/qopenkodewindow.h +++ b/src/plugins/platforms/openkode/qopenkodewindow.h @@ -63,7 +63,7 @@ public: void setVisible(bool visible); WId winId() const; - QPlatformGLContext *glContext() const; + QPlatformOpenGLContext *glContext() const; void raise(); void lower(); |