Quick fix after MTR merge

qgis · Feb 23, 2014 · e969376 · e969376
1 parent fafa58e
commit e969376
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -1799,6 +1799,7 @@ void QgsMapCanvas::mapToolDestroyed()
   mMapTool = 0;
 }
 
+#if 0 // TODO[MD]: after merge
 #ifdef HAVE_TOUCH
 bool QgsMapCanvas::event( QEvent * e )
 {
@@ -1823,3 +1824,4 @@ bool QgsMapCanvas::event( QEvent * e )
   return done;
 }
 #endif
+#endif