Initial checkin for ZoomTool implementation

Change-Id: I0f2c8906a48b0c1d45fb980a349a8ffb135130b5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

3 files changed, 19 insertions, 0 deletions

diff --git a/src/plugins/qmltooling/shared/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h
index 35817064e2..7e5ba65fd4 100644
--- a/src/plugins/qmltooling/shared/abstracttool.h
+++ b/src/plugins/qmltooling/shared/abstracttool.h
@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
 class QMouseEvent;
 class QKeyEvent;
 class QWheelEvent;
+class QTouchEvent;
 QT_END_NAMESPACE
 
 namespace QmlJSDebugger {
@@ -76,6 +77,8 @@ public:
     virtual void keyPressEvent(QKeyEvent *event) = 0;
     virtual void keyReleaseEvent(QKeyEvent *keyEvent) = 0;
 
+    virtual void touchEvent(QTouchEvent *) {}
+
 private:
     AbstractViewInspector *m_inspector;
 };
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
index 33e47d270d..135da1b8b7 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
@@ -50,6 +50,7 @@
 #include <QtQml/private/qqmlinspectorservice_p.h>
 
 #include <QtGui/QMouseEvent>
+#include <QtGui/QTouchEvent>
 
 namespace QmlJSDebugger {
 
@@ -220,6 +221,12 @@ bool AbstractViewInspector::eventFilter(QObject *obj, QEvent *event)
         if (wheelEvent(static_cast<QWheelEvent*>(event)))
             return true;
         break;
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate:
+    case QEvent::TouchEnd:
+        if (touchEvent(static_cast<QTouchEvent*>(event)))
+            return true;
+        break;
     default:
         break;
     }
@@ -300,6 +307,12 @@ bool AbstractViewInspector::wheelEvent(QWheelEvent *event)
     return true;
 }
 
+bool AbstractViewInspector::touchEvent(QTouchEvent *event)
+{
+    m_currentTool->touchEvent(event);
+    return true;
+}
+
 void AbstractViewInspector::handleMessage(const QByteArray &message)
 {
     QDataStream ds(message);
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h
index 0dacc92233..04ca02917e 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.h
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.h
@@ -56,6 +56,8 @@ class QQmlInspectorService;
 class QKeyEvent;
 class QMouseEvent;
 class QWheelEvent;
+class QTouchEvent;
+
 QT_END_NAMESPACE
 
 namespace QmlJSDebugger {
@@ -128,6 +130,7 @@ protected:
     virtual bool keyReleaseEvent(QKeyEvent *keyEvent);
     virtual bool mouseDoubleClickEvent(QMouseEvent *event);
     virtual bool wheelEvent(QWheelEvent *event);
+    virtual bool touchEvent(QTouchEvent *event);
 
 private slots:
     void sendColorChanged(const QColor &color);