Merge remote-tracking branch 'upstream/feature/manual-layout' into feature/manual-layout
This commit is contained in:
commit
b49087295e
|
@ -1897,7 +1897,7 @@ void VPMainWindow::AboutToShowDockMenu()
|
||||||
|
|
||||||
QAction *actionPreferences = menu->addAction(tr("Preferences"));
|
QAction *actionPreferences = menu->addAction(tr("Preferences"));
|
||||||
actionPreferences->setMenuRole(QAction::NoRole);
|
actionPreferences->setMenuRole(QAction::NoRole);
|
||||||
connect(actionPreferences, &QAction::triggered, this, &VPMainWindow::Preferences);
|
connect(actionPreferences, &QAction::triggered, this, &VPMainWindow::on_actionPreferences_triggered);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif //defined(Q_OS_MAC)
|
#endif //defined(Q_OS_MAC)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user