diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-23 05:13:34 (GMT) |
| commit | aab648826f0a11a93341f29e88c46902d5f31e4d (patch) | |
| tree | 11d26e0f7353c66a92c7af23a67bf32782f19332 /src/gui/kernel/qgesture_p.h | |
| parent | 5de213210ef4f14e698c3fd970cf7e6c5b27c72d (diff) | |
| parent | eeb116b56f9555458438dfe235b16488db9b1494 (diff) | |
| download | Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.zip Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.gz Qt-aab648826f0a11a93341f29e88c46902d5f31e4d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qgesture_p.h')
| -rw-r--r-- | src/gui/kernel/qgesture_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/kernel/qgesture_p.h b/src/gui/kernel/qgesture_p.h index 7f69a4e..975c0c9 100644 --- a/src/gui/kernel/qgesture_p.h +++ b/src/gui/kernel/qgesture_p.h @@ -68,7 +68,7 @@ class QGesturePrivate : public QObjectPrivate public: QGesturePrivate() : gestureType(Qt::CustomGesture), state(Qt::NoGesture), isHotSpotSet(false), - targetObject(0), accept(true) + targetObject(0) { } @@ -77,7 +77,6 @@ public: QPointF hotSpot; bool isHotSpotSet; QObject *targetObject; - bool accept; }; class QPanGesturePrivate : public QGesturePrivate @@ -90,9 +89,9 @@ public: { } - QSizeF totalOffset; - QSizeF lastOffset; - QSizeF offset; + QPointF totalOffset; + QPointF lastOffset; + QPointF offset; QPoint lastPosition; qreal acceleration; }; |