summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwindow.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel/qwindow.h')
-rw-r--r--src/gui/kernel/qwindow.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index d1c48484ab..4356153683 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -44,7 +44,9 @@
#include <QtCore/QObject>
#include <QtCore/QEvent>
-#include <QtGui/qwindowformat_qpa.h>
+
+#include <QtGui/qguiglformat_qpa.h>
+#include <QtGui/qwindowdefs.h>
QT_BEGIN_HEADER
@@ -64,8 +66,8 @@ class QMouseEvent;
class QWheelEvent;
#endif
+class QPlatformGLSurface;
class QPlatformWindow;
-class QWindowContext;
class QWindowSurface;
class Q_GUI_EXPORT QWindow : public QObject
@@ -100,9 +102,10 @@ public:
Qt::WindowModality windowModality() const;
void setWindowModality(Qt::WindowModality windowModality);
- void setWindowFormat(const QWindowFormat &format);
- QWindowFormat requestedWindowFormat() const;
- QWindowFormat actualWindowFormat() const;
+ void setGLFormat(const QGuiGLFormat &format);
+ QGuiGLFormat glFormat() const;
+
+ QPlatformGLSurface *glSurface() const;
void setSurfaceType(SurfaceType type);
SurfaceType surfaceType() const;
@@ -137,8 +140,6 @@ public:
void setWindowIcon(const QImage &icon) const;
- QWindowContext *glContext() const;
-
void destroy();
QPlatformWindow *handle() const;