diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-02-26 14:39:00 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-05-11 13:38:54 (GMT) |
| commit | a3d8cfb1ee89e0600add864db53d67552820b95a (patch) | |
| tree | d396d751de49d26c052b8752c94d5247503083e2 /src/gui/graphicsview/qgraphicsitem_p.h | |
| parent | 7396eea79c9464d0c246106834cbce02320e7989 (diff) | |
| download | Qt-a3d8cfb1ee89e0600add864db53d67552820b95a.zip Qt-a3d8cfb1ee89e0600add864db53d67552820b95a.tar.gz Qt-a3d8cfb1ee89e0600add864db53d67552820b95a.tar.bz2 | |
Merge of the maemo-gestures branch onto qt/4.5.0
This is a squashed merge of all of the changes in the maemo-gestures
branch on-top of the qt/4.5.0 branch.
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem_p.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 5e77dfd..a67a49a 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -54,6 +54,7 @@ // #include "qgraphicsitem.h" +#include "qset.h" #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW @@ -297,6 +298,7 @@ public: int siblingIndex; int index; int depth; + QSet<Qt::GestureType> gestures; // Packed 32 bytes quint32 acceptedMouseButtons : 5; |