summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/opengl/qgl.h')
-rw-r--r--src/opengl/qgl.h10
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;