Merge branch 'master' of github.com:qgis/Quantum-GIS

Author: timlinux

src/app/qgisapp.cpp

@@ -636,21 +636,21 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
     QgsDebugMsg( "Tips are disabled" );
   }
 
-  // supposedly all actions have been added, now register them to the shortcut manager
-  QgsShortcutsManager::instance()->registerAllChildrenActions( this );
-
-  // request notification of FileOpen events (double clicking a file icon in Mac OS X Finder)
-  QgsApplication::setFileOpenEventReceiver( this );
-
 #ifdef HAVE_TOUCH
   //add reacting to long click in android
   grabGesture( Qt::TapAndHoldGesture );
 #else
-  //remove mActionTouch button
+  //remove mActionTouch button before populuating the shortcuts
   delete mActionTouch;
   mActionTouch = 0;
 #endif
 
+  // supposedly all actions have been added, now register them to the shortcut manager
+  QgsShortcutsManager::instance()->registerAllChildrenActions( this );
+
+  // request notification of FileOpen events (double clicking a file icon in Mac OS X Finder)
+  QgsApplication::setFileOpenEventReceiver( this );
+
   // update windows
   qApp->processEvents();