diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -80,6 +80,13 @@ qgsexpressionhighlighter.cpp
 qgsquerybuilder.cpp
 )
 
+IF (WITH_TOUCH)
+  SET(QGIS_GUI_SRCS
+      ${QGIS_GUI_SRCS}
+      qgsmaptooltouch.cpp
+  )
+ENDIF (WITH_TOUCH)
+
 SET(QGIS_GUI_MOC_HDRS
 
 symbology-ng/qgsdashspacedialog.h
@@ -185,6 +192,13 @@ attributetable/qgsattributetableidcolumnpair.h
 attributetable/qgsattributetabledelegate.h
 )
 
+IF (WITH_TOUCH)
+  SET(QGIS_GUI_HDRS
+      ${QGIS_GUI_HDRS}
+      qgsmaptooltouch.h
+  )
+ENDIF (WITH_TOUCH)
+
 SET(QGIS_GUI_UI_HDRS
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsdetaileditemwidgetbase.h
 ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsgenericprojectionselectorbase.h

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1559,4 +1559,29 @@ void QgsMapCanvas::mapToolDestroyed()
 {
   QgsDebugMsg( "maptool destroyed" );
   mMapTool = 0;
-}
+}
+
+#ifdef HAVE_TOUCH
+bool QgsMapCanvas::event( QEvent * e )
+{
+  bool done = false;
+  if ( mDrawing )
+  {
+    return done;
+  }
+  if (e->type() == QEvent::Gesture )
+  {
+    // call handler of current map tool
+    if ( mMapTool )
+    {
+      done = mMapTool->gestureEvent( static_cast<QGestureEvent*>(e) );
+    }
+  }
+  else
+  {
+    // pass other events to base class
+    done = QGraphicsView::event( e );
+  }
+  return done;
+}
+#endif
diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h
@@ -30,6 +30,10 @@
 #include <QGraphicsView>
 #include <QtCore>
 
+#ifdef HAVE_TOUCH
+#include <QGestureEvent>
+#endif
+
 class QWheelEvent;
 class QPixmap;
 class QPaintEvent;
@@ -357,6 +361,11 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
     void zoomNextStatusChanged( bool );
 
   protected:
+#ifdef HAVE_TOUCH
+    //! Overridden standard event to be gestures aware
+    bool event( QEvent * e );
+#endif
+
     //! Overridden key press event
     void keyPressEvent( QKeyEvent * e );
 

diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
@@ -141,6 +141,13 @@ void QgsMapTool::keyReleaseEvent( QKeyEvent *e )
   Q_UNUSED( e );
 }
 
+#ifdef HAVE_TOUCH
+bool QgsMapTool::gestureEvent( QGestureEvent *e )
+{
+  Q_UNUSED( e );
+}
+#endif
+
 void QgsMapTool::renderComplete()
 {
 }

diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
@@ -20,6 +20,10 @@
 #include <QString>
 #include <QObject>
 
+#ifdef HAVE_TOUCH
+#include <QGestureEvent>
+#endif
+
 class QgsMapLayer;
 class QgsMapCanvas;
 class QKeyEvent;
@@ -62,6 +66,11 @@ class GUI_EXPORT QgsMapTool : public QObject
     //! Added in version 1.1
     virtual void keyReleaseEvent( QKeyEvent* e );
 
+#ifdef HAVE_TOUCH
+    //! gesture event for overriding. Default implementation does nothing.
+    virtual bool gestureEvent( QGestureEvent* e );
+#endif
+
     //! Called when rendering has finished. Default implementation does nothing.
     virtual void renderComplete();
 

diff --git a/src/gui/qgsmaptooltouch.cpp b/src/gui/qgsmaptooltouch.cpp
@@ -0,0 +1,129 @@
+/***************************************************************************
+    qgsmaptooltouch.cpp  -  map tool for zooming and panning using qgestures
+    ----------------------
+    begin                : February 2012
+    copyright            : (C) 2012 by Marco Bernasocchi
+    email                : marco at bernawebdesign.ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsmaptooltouch.h"
+#include "qgsmapcanvas.h"
+#include "qgscursors.h"
+#include "qgsmaptopixel.h"
+#include <QBitmap>
+#include <QCursor>
+#include <QMouseEvent>
+#include <qgslogger.h>
+
+
+QgsMapToolTouch::QgsMapToolTouch( QgsMapCanvas* canvas )
+  : QgsMapTool( canvas ), mDragging( false ), mPinching( false )
+{
+  // set cursor
+//  QBitmap panBmp = QBitmap::fromData( QSize( 16, 16 ), pan_bits );
+//  QBitmap panBmpMask = QBitmap::fromData( QSize( 16, 16 ), pan_mask_bits );
+//  mCursor = QCursor( panBmp, panBmpMask, 5, 5 );
+}
+
+QgsMapToolTouch::~QgsMapToolTouch()
+{
+  mCanvas->ungrabGesture(Qt::PinchGesture);
+}
+
+void QgsMapToolTouch::activate()
+{
+  mCanvas->grabGesture(Qt::PinchGesture);
+  QgsMapTool::activate();
+}
+
+void QgsMapToolTouch::deactivate()
+{
+  mCanvas->ungrabGesture(Qt::PinchGesture);
+  QgsMapTool::deactivate();
+}
+
+void QgsMapToolTouch::canvasMoveEvent( QMouseEvent * e )
+{
+  if ( !mPinching )
+  {
+    if (( e->buttons() & Qt::LeftButton ) )
+    {
+      mDragging = true;
+      // move map and other canvas items
+      mCanvas->panAction( e );
+    }
+  }
+}
+
+void QgsMapToolTouch::canvasReleaseEvent( QMouseEvent * e )
+{
+  if ( !mPinching )
+  {
+    if ( e->button() == Qt::LeftButton )
+    {
+      if ( mDragging )
+      {
+        mCanvas->panActionEnd( e->pos() );
+        mDragging = false;
+      }
+      else // add pan to mouse cursor
+      {
+        // transform the mouse pos to map coordinates
+        QgsPoint center = mCanvas->getCoordinateTransform()->toMapPoint( e->x(), e->y() );
+        mCanvas->setExtent( QgsRectangle( center, center ) );
+        mCanvas->refresh();
+      }
+    }
+  }
+}
+
+void QgsMapToolTouch::canvasDoubleClickEvent( QMouseEvent *e )
+{
+  if ( !mPinching )
+  {
+    mCanvas->zoomWithCenter(e->x(), e->y(), true);
+  }
+}
+
+bool QgsMapToolTouch::gestureEvent(QGestureEvent *event)
+{
+  qDebug() << "gesture " << event;
+  if (QGesture *gesture = event->gesture(Qt::PinchGesture))
+  {
+    mPinching = true;
+    pinchTriggered(static_cast<QPinchGesture *>(gesture));
+  }
+  return true;
+}
+
+
+void QgsMapToolTouch::pinchTriggered(QPinchGesture *gesture)
+{
+  if (gesture->state() == Qt::GestureFinished) {
+    //a very small totalScaleFactor indicates a two finger tap (pinch gesture without pinching)
+    if (0.98 < gesture->totalScaleFactor()  && gesture->totalScaleFactor() < 1.02 )
+    {
+      mCanvas->zoomOut();
+    }
+    else
+    {
+      //Transfor global coordinates to widget coordinates
+      QPoint pos = gesture->centerPoint().toPoint();
+      pos = mCanvas->mapFromGlobal( pos );
+      // transform the mouse pos to map coordinates
+      QgsPoint center  = mCanvas->getCoordinateTransform()->toMapPoint( pos.x(),pos.y() );
+      QgsRectangle r = mCanvas->extent();
+      r.scale( 1/gesture->totalScaleFactor(), &center );
+      mCanvas->setExtent( r );
+      mCanvas->refresh();
+    }
+    mPinching = false;
+  }
+}
diff --git a/src/gui/qgsmaptooltouch.h b/src/gui/qgsmaptooltouch.h
@@ -0,0 +1,62 @@
+/***************************************************************************
+    qgsmaptooltouch.h  -  map tool for zooming and panning using qgestures
+    ----------------------
+    begin                : February 2012
+    copyright            : (C) 2012 by Marco Bernasocchi
+    email                : marco at bernawebdesign.ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSMAPTOOLTOUCH_H
+#define QGSMAPTOOLTOUCH_H
+
+#include "qgsmaptool.h"
+#include <QGestureEvent>
+#include <QPinchGesture>
+
+class QgsMapCanvas;
+
+
+/** \ingroup gui
+ * A map tool for panning the map.
+ * @see QgsMapTool
+ */
+class GUI_EXPORT QgsMapToolTouch : public QgsMapTool
+{
+  public:
+    //! constructor
+    QgsMapToolTouch( QgsMapCanvas* canvas );
+
+    ~QgsMapToolTouch();
+
+    void activate();
+    void deactivate();
+
+    //! Overridden mouse move event
+    virtual void canvasMoveEvent( QMouseEvent * e );
+
+    //! Overridden mouse release event
+    virtual void canvasReleaseEvent( QMouseEvent * e );
+
+    //! Overridden Mouse double click event.
+    virtual void canvasDoubleClickEvent( QMouseEvent * e );
+
+    virtual bool isTransient() { return true; }
+
+  private:
+
+    //! Flag to indicate a map canvas drag operation is taking place
+    bool mDragging;
+    //! Flag to indicate a pinch gesture is taking place
+    bool mPinching;
+    bool gestureEvent(QGestureEvent *event);
+    void pinchTriggered(QPinchGesture *gesture);
+};
+
+#endif
diff --git a/src/plugins/compass/compass.cpp b/src/plugins/compass/compass.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "compass.h"
+#include "qgslogger.h"
 
 Compass::Compass()
 {
@@ -61,7 +62,7 @@ bool Compass::start()
   mSensor.start();
   if ( !mSensor.isActive() )
   {
-    qDebug() << "Compasssensor didn't start!" << endl;
+    QgsDebugMsg( "Compasssensor didn't start!" );
     return false;
   }
   return true;
@@ -72,7 +73,7 @@ bool Compass::stop()
   mSensor.stop();
   if ( mSensor.isActive() )
   {
-    qDebug() << "Compasssensor didn't stop!" << endl;
+    QgsDebugMsg( "Compasssensor didn't stop!" );
     return false;
   }
   return true;

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -311,6 +311,7 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
+   <addaction name="mActionTouch"/>
    <addaction name="mActionPan"/>
    <addaction name="mActionPanToSelected"/>
    <addaction name="mActionZoomIn"/>
@@ -1620,6 +1621,21 @@
     <string>Pan Map to Selection</string>
    </property>
   </action>
+  <action name="mActionTouch">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/gis/mActionTouch.png</normaloff>:/images/themes/gis/mActionTouch.png</iconset>
+   </property>
+   <property name="text">
+    <string>Touch zoom and pan</string>
+   </property>
+   <property name="toolTip">
+    <string>Touch zoom and pan</string>
+   </property>
+  </action>
   <action name="mActionOffsetCurve">
    <property name="checkable">
     <bool>true</bool>

diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -98,6 +98,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="mCloseButton">
+       <property name="text">
+        <string>Close</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item row="1" column="0">