Showing the changes to interface/src/Menu.cpp (1 of 2 files). Show all
Unified · Split
| @@ -72,7 +72,8 @@ Menu::Menu() : · 71 unmodified lines | ||
| 72 | 72 | MenuOption::AboutApp, |
| 73 | 73 | 0, |
| 74 | 74 | this, |
| 75 | − SLOT(aboutApp())); | |
| 75 | + SLOT(aboutApp()), | |
| 76 | + QAction::AboutRole); | |
| 76 | 77 | #endif |
| 77 | 78 | |
| 78 | 79 | (addActionToQMenuAndActionHash(fileMenu, |
| @@ -120,7 +121,9 @@ Menu::Menu() : · 41 unmodified lines | ||
| 120 | 121 | MenuOption::Quit, |
| 121 | 122 | Qt::CTRL | Qt::Key_Q, |
| 122 | 123 | appInstance, |
| 123 | − SLOT(quit())); | |
| 124 | + SLOT(quit()), | |
| 125 | + QAction::QuitRole); | |
| 126 | + | |
| 124 | 127 | |
| 125 | 128 | QMenu* editMenu = addMenu("Edit"); |
| 126 | 129 | |
| @@ -128,7 +131,8 @@ Menu::Menu() : · 1 unmodified line | ||
| 128 | 131 | MenuOption::Preferences, |
| 129 | 132 | Qt::CTRL | Qt::Key_Comma, |
| 130 | 133 | this, |
| 131 | − SLOT(editPreferences())); | |
| 134 | + SLOT(editPreferences()), | |
| 135 | + QAction::PreferencesRole); | |
| 132 | 136 | |
| 133 | 137 | addDisabledActionAndSeparator(editMenu, "Voxels"); |
| 134 | 138 | |
| @@ -679,7 +683,8 @@ QAction* Menu::addActionToQMenuAndActionHash(QMenu* destinationMenu, · 544 unmodified lines | ||
| 679 | 683 | const QString actionName, |
| 680 | 684 | const QKeySequence& shortcut, |
| 681 | 685 | const QObject* receiver, |
| 682 | − const char* member) { | |
| 686 | + const char* member, | |
| 687 | + QAction::MenuRole role) { | |
| 683 | 688 | QAction* action; |
| 684 | 689 | |
| 685 | 690 | if (receiver && member) { |
| @@ -688,6 +693,7 @@ QAction* Menu::addActionToQMenuAndActionHash(QMenu* destinationMenu, · 2 unmodified lines | ||
| 688 | 693 | action = destinationMenu->addAction(actionName); |
| 689 | 694 | action->setShortcut(shortcut); |
| 690 | 695 | } |
| 696 | + action->setMenuRole(role); | |
| 691 | 697 | |
| 692 | 698 | _actionHash.insert(actionName, action); |
| 693 | 699 | |