diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-06-09 09:37:42 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-06-09 09:37:42 +0200 |
| commit | d19f8ffc1ddad91a144f85f0c6aa04fece4bba27 (patch) | |
| tree | 15c473aa1a2c07b5ae5d70bfe8d4a1b0cf4ecfe0 /src/declarative/items/qsgcanvas_p.h | |
| parent | 2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b (diff) | |
| parent | d356a263f627b55424a9750163a00dffc6faebcf (diff) | |
Merge branch 'master' into qtquick2
Diffstat (limited to 'src/declarative/items/qsgcanvas_p.h')
| -rw-r--r-- | src/declarative/items/qsgcanvas_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/items/qsgcanvas_p.h b/src/declarative/items/qsgcanvas_p.h index 87fae1c31a..90132f8c91 100644 --- a/src/declarative/items/qsgcanvas_p.h +++ b/src/declarative/items/qsgcanvas_p.h @@ -180,6 +180,7 @@ public: , isRenderBlocked(false) , isExternalUpdatePending(false) , syncAlreadyHappened(false) + , inSync(false) , doGrab(false) , shouldExit(false) , hasExited(false) @@ -222,6 +223,7 @@ public: uint isRenderBlocked : 1; uint isExternalUpdatePending : 1; uint syncAlreadyHappened : 1; + uint inSync : 1; uint doGrab : 1; uint shouldExit : 1; |