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/gui/kernel/qplatformwindow_qpa.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/gui/kernel/qplatformwindow_qpa.h')
| -rw-r--r-- | src/gui/kernel/qplatformwindow_qpa.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h index 8166344246..dc988e183e 100644 --- a/src/gui/kernel/qplatformwindow_qpa.h +++ b/src/gui/kernel/qplatformwindow_qpa.h @@ -41,13 +41,13 @@ #ifndef QPLATFORMWINDOW_H #define QPLATFORMWINDOW_H - #include <QtCore/qscopedpointer.h> #include <QtCore/qrect.h> #include <QtCore/qmargins.h> #include <QtCore/qstring.h> #include <QtGui/qwindowdefs.h> - +#include <QtGui/qwindow.h> +#include <QtGui/qplatformglcontext_qpa.h> QT_BEGIN_HEADER @@ -57,9 +57,8 @@ QT_MODULE(Gui) class QPlatformWindowPrivate; class QWindow; -class QPlatformGLSurface; -class Q_GUI_EXPORT QPlatformWindow +class Q_GUI_EXPORT QPlatformWindow : public QPlatformSurface { Q_DECLARE_PRIVATE(QPlatformWindow) public: @@ -69,6 +68,8 @@ public: QWindow *window() const; QPlatformWindow *parent() const; + virtual QSurfaceFormat format() const; + virtual void setGeometry(const QRect &rect); virtual QRect geometry() const; @@ -90,8 +91,6 @@ public: virtual void setOpacity(qreal level); virtual void requestActivateWindow(); - virtual QPlatformGLSurface *createGLSurface() const; - virtual bool setKeyboardGrabEnabled(bool grab); virtual bool setMouseGrabEnabled(bool grab); |