diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
| commit | 084c5b3db794af1ce86b2b17455d9be5e64baebe (patch) | |
| tree | 46d29a7b89ff251c07b6fdd59c57e30f14baa64a /src/plugins/platforms/windows/qwindowswindow.h | |
| parent | f4a0d6d2494d1dd41cd5b854a48b435120714d32 (diff) | |
| parent | 54987c6bf55b159d3ddb79461439700f6e0111f9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.h | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 07f3976d87..996542f92a 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -124,18 +124,19 @@ public: WithinSetParent = 0x2, FrameDirty = 0x4, //! Frame outdated by setStyle, recalculate in next query. OpenGLSurface = 0x10, - OpenGLDoubleBuffered = 0x20, - OpenGlPixelFormatInitialized = 0x40, - BlockedByModal = 0x80, - SizeGripOperation = 0x100, - FrameStrutEventsEnabled = 0x200, - SynchronousGeometryChangeEvent = 0x400, - WithinSetStyle = 0x800, - WithinDestroy = 0x1000, - TouchRegistered = 0x2000, - AlertState = 0x4000, - Exposed = 0x08000, - WithinCreate = 0x10000 + OpenGL_ES2 = 0x20, + OpenGLDoubleBuffered = 0x40, + OpenGlPixelFormatInitialized = 0x80, + BlockedByModal = 0x100, + SizeGripOperation = 0x200, + FrameStrutEventsEnabled = 0x400, + SynchronousGeometryChangeEvent = 0x800, + WithinSetStyle = 0x1000, + WithinDestroy = 0x2000, + TouchRegistered = 0x4000, + AlertState = 0x8000, + Exposed = 0x10000, + WithinCreate = 0x20000 }; struct WindowData |