diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-21 13:39:26 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-21 14:02:22 +0200 |
commit | 176f30b13739b352cbe453cba7796d9a9c808bcd (patch) | |
tree | 8fa60b6ae4ef06455652863a0406bc5e86a22303 /src/opengl/qgl.h | |
parent | 272daebaa07b21e372ad4274fafb51ce0be92396 (diff) |
OpenGL API refactor.
Rename QGuiGLFormat to QSurfaceFormat, and make QWindow sub-class of
QSurface and QPlatformWindow sub-class of QPlatformSurface, instead of
having QPlatformGLSurface accessor in QWindow.
Diffstat (limited to 'src/opengl/qgl.h')
-rw-r--r-- | src/opengl/qgl.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index f6051fa179..c9908ad01f 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -48,9 +48,7 @@ #include <QtCore/qmap.h> #include <QtCore/qscopedpointer.h> -#ifdef Q_WS_QPA -#include <QtGui/QGuiGLFormat> -#endif +#include <QtGui/QSurfaceFormat> QT_BEGIN_HEADER @@ -282,10 +280,8 @@ public: static OpenGLVersionFlags openGLVersionFlags(); -#if defined(Q_WS_QPA) - static QGLFormat fromGuiGLFormat(const QGuiGLFormat &format); - static QGuiGLFormat toGuiGLFormat(const QGLFormat &format); -#endif + static QGLFormat fromSurfaceFormat(const QSurfaceFormat &format); + static QSurfaceFormat toSurfaceFormat(const QGLFormat &format); private: QGLFormatPrivate *d; |