Merge pull request #122 from mbernasocchi/android

Android

Author: timlinux

src/app/main.cpp

@@ -241,6 +241,11 @@ int main( int argc, char *argv[] )
   int mySnapshotHeight = 600;
 
   bool myHideSplash = false;
+#if defined(ANDROID)
+  QgsDebugMsg( QString( "Android: Splash hidden" ) );
+  myHideSplash = true;
+#endif
+
   bool myRestorePlugins = true;
   bool myCustomization = true;
 

src/app/qgisapp.cpp

@@ -645,6 +645,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
 #ifdef HAVE_TOUCH
   //add reacting to long click in android
   grabGesture( Qt::TapAndHoldGesture );
+#else
+  //remove mActionTouch button
+  delete mActionTouch;
+  mActionTouch=0;
 #endif
 
   // update windows
@@ -2785,6 +2789,7 @@ void QgisApp::fileNew( bool thePromptToSaveFlag )
   // set the initial map tool
   mMapCanvas->setMapTool( mMapTools.mPan );
   mNonEditMapTool = mMapTools.mPan;  // signals are not yet setup to catch this
+
 #ifdef HAVE_TOUCH
   mMapCanvas->setMapTool( mMapTools.mTouch );
   mNonEditMapTool = mMapTools.mTouch;  // signals are not yet setup to catch this