Merge branch 'master' into topic/mmfphonon

Conflicts:
	src/3rdparty/phonon/phonon/factory.cpp
	src/s60installs/qt_libs.pro

1 files changed, 5 insertions, 33 deletions

diff --git a/src/gui/kernel/qgesture_p.h b/src/gui/kernel/qgesture_p.h
index caf851e..56eaee7 100644
--- a/src/gui/kernel/qgesture_p.h
+++ b/src/gui/kernel/qgesture_p.h
@@ -56,10 +56,12 @@
 #include "qrect.h"
 #include "qpoint.h"
 #include "qdatetime.h"
+#include "qgesture.h"
 #include "private/qobject_p.h"
 
 QT_BEGIN_NAMESPACE
 
+class QObject;
 class QGraphicsItem;
 class QGesturePrivate : public QObjectPrivate
 {
@@ -67,45 +69,15 @@ class QGesturePrivate : public QObjectPrivate
 
 public:
     QGesturePrivate()
-        : state(Qt::NoGesture), graphicsItem(0), singleshot(0), duration(0) { }
-
-    void init(const QPoint &startPos, const QPoint &lastPos,
-              const QPoint &pos, const QRect &rect,
-              const QPoint &hotSpot, const QDateTime &startTime,
-              uint duration)
+        : graphicsItem(0), eventFilterProxyGraphicsItem(0), state(Qt::NoGesture)
     {
-        this->rect = rect;
-        this->hotSpot = hotSpot;
-        this->startTime = startTime;
-        this->duration = duration;
-        this->startPos = startPos;
-        this->lastPos = lastPos;
-        this->pos = pos;
     }
 
-    QString type;
-    Qt::GestureState state;
 
-    QPointer<QWidget> widget;
     QGraphicsItem *graphicsItem;
-    uint singleshot:1;
-
-    QRect rect;
-    QPoint hotSpot;
-    QDateTime startTime;
-    uint duration;
-    QPoint startPos;
-    QPoint lastPos;
-    QPoint pos;
-};
+    QGraphicsItem *eventFilterProxyGraphicsItem;
 
-class QPanningGesturePrivate : public QGesturePrivate
-{
-    Q_DECLARE_PUBLIC(QPanningGesture)
-
-public:
-    Qt::DirectionType lastDirection;
-    Qt::DirectionType direction;
+    Qt::GestureState state;
 };
 
 QT_END_NAMESPACE