On Mac use Close for quit action (conflicts with app menu's quit acti…

…on and key sequence)
qgis · Mar 7, 2013 · 290f8fd · 290f8fd
1 parent 2fe847c
commit 290f8fd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -167,6 +167,8 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mActionAddArrow->setCheckable( true );
 
 #ifdef Q_WS_MAC
+  mActionQuit->setText( tr( "Close" ) );
+  mActionQuit->setShortcut( QKeySequence::Close );
   QMenu *appMenu = menuBar()->addMenu( tr( "QGIS" ) );
   appMenu->addAction( mQgis->actionAbout() );
   appMenu->addAction( mQgis->actionOptions() );
@@ -250,7 +252,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   connect( mWindowMenu, SIGNAL( aboutToShow() ), this, SLOT( populateWindowMenu() ) );
   menuBar()->addMenu( mWindowMenu );
 
-  mHelpMenu = new QMenu( tr( "Help" ) );
+  mHelpMenu = new QMenu( tr( "Help" ), this );
   mHelpMenu->setObjectName( "mHelpMenu" );
   connect( mHelpMenu, SIGNAL( aboutToShow() ), this, SLOT( populateHelpMenu() ) );
   menuBar()->addMenu( mHelpMenu );