diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-05 08:30:28 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-05 08:30:28 +1000 |
| commit | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (patch) | |
| tree | f674a92a37a130e1ce0bfd7080019fe3b36e9c1b /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 897014a47b41dcf2b9d91549be9b96890d5291c7 (diff) | |
| parent | 2843c97f5310f4636c933ced56570ab7db2b707e (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 5c3622be2..805b55472 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -126,6 +126,7 @@ public: depth(0), focusProxy(0), subFocusItem(0), + imHints(Qt::ImhNone), acceptedMouseButtons(0x1f), visible(1), explicitlyHidden(0), @@ -419,8 +420,9 @@ public: int depth; QGraphicsItem *focusProxy; QGraphicsItem *subFocusItem; + Qt::InputMethodHints imHints; - // Packed 32 bytes + // Packed 32 bits quint32 acceptedMouseButtons : 5; quint32 visible : 1; quint32 explicitlyHidden : 1; |