diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-04 15:58:55 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-04 15:58:55 (GMT) |
| commit | 5ff97be22a5246c11851c2c6471a0b7ee2399425 (patch) | |
| tree | 4318dec329f4b3401184c9df80272c09e242bec3 /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 0009fa533e4d5ca1a75ba3b56af082cdcfee55cc (diff) | |
| parent | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (diff) | |
| download | Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.zip Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.tar.gz Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index ca56c18..51d2ffd 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -453,7 +453,7 @@ public: QGraphicsItem *focusScopeItem; Qt::InputMethodHints imHints; QGraphicsItem::PanelModality panelModality; - QMap<Qt::GestureType, Qt::GestureContext> gestureContext; + QMap<Qt::GestureType, Qt::GestureFlags> gestureContext; // Packed 32 bits quint32 acceptedMouseButtons : 5; |