diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-10 13:29:09 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-10 13:29:09 (GMT) |
commit | 9683cf068c3f933f836dc2a5b4a19b1c2f86d38a (patch) | |
tree | 454bd63232cb2e67a17519a4df30d5db20a0f7a9 /src/gui/kernel/qwidget_p.h | |
parent | 3bd53464371aed9c655f39d096665f9e4875ea20 (diff) | |
parent | 1a5e7171b9da383ca5f6be92b7cb6e502fd79fc4 (diff) | |
download | Qt-9683cf068c3f933f836dc2a5b4a19b1c2f86d38a.zip Qt-9683cf068c3f933f836dc2a5b4a19b1c2f86d38a.tar.gz Qt-9683cf068c3f933f836dc2a5b4a19b1c2f86d38a.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qwidget_p.h')
-rw-r--r-- | src/gui/kernel/qwidget_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 8f8b467..bd671c8 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -133,6 +133,10 @@ struct QTLWExtra { uint embedded : 1; // *************************** Platform specific values (bit fields first) ********** +#ifndef QT_NO_XSYNC + int newCounterValueHi : 32; + uint newCounterValueLo : 32; +#endif #if defined(Q_WS_X11) // <----------------------------------------------------------- X11 uint spont_unmapped: 1; // window was spontaneously unmapped uint dnd : 1; // DND properties installed @@ -158,6 +162,10 @@ struct QTLWExtra { QWSManager *qwsManager; #endif #endif +#ifndef QT_NO_XSYNC + WId syncUpdateCounter; + ulong syncRequestTimestamp; +#endif }; struct QWExtra { |