Merge pull request #184 from mbernasocchi/android

NathanW2 · NathanW2 · commit 10d4deaa2926 · 2012-06-23T03:19:26.000-07:00
fixing bool QgsMapTool::gestureEvent( QGestureEvent *e )
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -643,7 +643,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   }
 
 #ifdef HAVE_TOUCH
-  //add reacting to long click in android
+  //add reacting to long click in touch
   grabGesture( Qt::TapAndHoldGesture );
 #else
   //remove mActionTouch button
diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
@@ -145,6 +145,7 @@ void QgsMapTool::keyReleaseEvent( QKeyEvent *e )
 bool QgsMapTool::gestureEvent( QGestureEvent *e )
 {
   Q_UNUSED( e );
+  return true;
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -643,7 +643,7 @@ QgisApp::QgisApp( QSplashScreen splash, bool restorePlugins, QWidget parent,`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`#ifdef HAVE_TOUCH`
`646`		`- //add reacting to long click in android`
	`646`	`+ //add reacting to long click in touch`
`647`	`647`	`grabGesture( Qt::TapAndHoldGesture );`
`648`	`648`	`#else`
`649`	`649`	`//remove mActionTouch button`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,7 @@ void QgsMapTool::keyReleaseEvent( QKeyEvent *e )`
`145`	`145`	`bool QgsMapTool::gestureEvent( QGestureEvent *e )`
`146`	`146`	`{`
`147`	`147`	`Q_UNUSED( e );`
	`148`	`+ return true;`
`148`	`149`	`}`
`149`	`150`	`#endif`
`150`	`151`