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/qwindow_p.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/qwindow_p.h')
-rw-r--r-- | src/gui/kernel/qwindow_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 1c4c4bffad..a8b118319d 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -60,11 +60,9 @@ public: QWindowPrivate() : QObjectPrivate() , windowFlags(Qt::Window) - , surfaceType(QWindow::RasterSurface) , parentWindow(0) , platformWindow(0) , visible(false) - , glSurface(0) , windowState(Qt::WindowNoState) , maximumSize(QWINDOWSIZE_MAX, QWINDOWSIZE_MAX) , modality(Qt::NonModal) @@ -78,14 +76,12 @@ public: } Qt::WindowFlags windowFlags; - QWindow::SurfaceType surfaceType; QWindow *parentWindow; QPlatformWindow *platformWindow; bool visible; - QGuiGLFormat requestedFormat; + QSurfaceFormat requestedFormat; QString windowTitle; QRect geometry; - QPlatformGLSurface *glSurface; Qt::WindowState windowState; QSize minimumSize; |