Showing with 5 additions and 9 deletions.
  1. +5 −8 src/app/qgisapp.cpp
  2. +0 −1 src/app/qgisapp.h
13 changes: 5 additions & 8 deletions src/app/qgisapp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -928,12 +928,6 @@ void QgisApp::createActions()
connect( mActionCustomization, SIGNAL( triggered() ), this, SLOT( customize() ) );

#ifdef Q_WS_MAC
// copy of Options action that gets moved to app Preferences...
mActionOptionsMac = new QAction( mActionOptions->text(), this );
mActionOptionsMac->setMenuRole( QAction::NoRole );
mActionOptionsMac->setIcon( mActionOptions->icon() );
connect( mActionOptionsMac, SIGNAL( triggered() ), this, SLOT( options() ) );

// Window Menu Items

mActionWindowMinimize = new QAction( tr( "Minimize" ), this );
Expand Down Expand Up @@ -1164,8 +1158,11 @@ void QgisApp::createMenus()
}

#ifdef Q_WS_MAC
// copy back the Options action after assigned to app Preferences...
mSettingsMenu->addAction( mActionOptionsMac );

// keep plugins from hijacking About and Preferences application menus
// these duplicate actions will be moved to application menus by Qt
mFileMenu->addAction( mActionAbout );
mFileMenu->addAction( mActionOptions );

// Window Menu

Expand Down
1 change: 0 additions & 1 deletion src/app/qgisapp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
// actions for menus and toolbars -----------------

#ifdef Q_WS_MAC
QAction *mActionOptionsMac;
QAction *mActionWindowMinimize;
QAction *mActionWindowZoom;
QAction *mActionWindowSeparator1;
Expand Down