diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/gui/kernel/qwindow_p.h | |
parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'src/gui/kernel/qwindow_p.h')
-rw-r--r-- | src/gui/kernel/qwindow_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index b665298ce0..375bd1e729 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -72,8 +72,10 @@ public: , parentWindow(0) , platformWindow(0) , visible(false) + , exposed(false) , windowState(Qt::WindowNoState) , resizeEventPending(true) + , receivedExpose(false) , positionPolicy(WindowFrameExclusive) , contentOrientation(Qt::PrimaryOrientation) , windowOrientation(Qt::PrimaryOrientation) @@ -100,17 +102,18 @@ public: return offset; } - QWindow::SurfaceType surfaceType; Qt::WindowFlags windowFlags; QWindow *parentWindow; QPlatformWindow *platformWindow; bool visible; + bool exposed; QSurfaceFormat requestedFormat; QString windowTitle; QRect geometry; Qt::WindowState windowState; bool resizeEventPending; + bool receivedExpose; PositionPolicy positionPolicy; Qt::ScreenOrientation contentOrientation; Qt::ScreenOrientation windowOrientation; |