Revert "MainWindow (macOS): Disable menu text heuristics"

This reverts commit 96950e0.

Changing the menu role after adding an action to the menu is unsupported
by Qt and seems to be the trigger for the crashes reported in issue #1077.

Author: dg0yt

src/gui/main_window.cpp

@@ -255,27 +255,6 @@ void MainWindow::setController(MainWindowController* new_controller, bool has_fi
 		createHelpMenu();
 
 #if defined(Q_OS_MACOS)
-	// Disable all menu text heuristics, as a workaround for QTBUG-30812.
-	// Note that QAction::NoRole triggers QTBUG-29051,
-	// warnings in QCocoaMenuItem::sync() about menu items having
-	// "unsupported role QPlatformMenuItem::MenuRole(NoRole)".
-	const auto menubar_actions = menuBar()->actions();
-	for (auto action : menubar_actions)
-	{
-		if (const auto menu = action->menu())
-		{
-			const auto menu_actions = menu->actions();
-			for (auto action : menu_actions)
-			{
-				if (action->menuRole() == QAction::TextHeuristicRole)
-					action->setMenuRole(QAction::NoRole);
-			}
-		}
-	}
-
-	// Probably related to QTBUG-62260.
-	// But even with Qt 5.9.3, the "Mapper" menu is not correct initially.
-	// (In Czech translation, the Settings menu is missing initially.)
 	if (isVisible() && qApp->activeWindow() == this)
 	{
 		// Force a menu synchronisation,

src/gui/map/map_editor.cpp

@@ -871,6 +871,9 @@ void MapEditorController::createActions()
 
 	show_grid_act = newCheckAction("showgrid", tr("Show grid"), this, SLOT(showGrid()), "grid.png", QString{}, "grid.html");
 	configure_grid_act = newAction("configuregrid", tr("Configure grid..."), this, SLOT(configureGrid()), "grid.png", QString{}, "grid.html");
+#if defined(Q_OS_MACOS)
+	configure_grid_act->setMenuRole(QAction::NoRole);
+#endif
 	pan_act = newToolAction("panmap", tr("Pan"), this, SLOT(pan()), "move.png", QString{}, "view_menu.html");
 	move_to_gps_pos_act = newAction("movegps", tr("Move to my location"), this, SLOT(moveToGpsPos()), "move-to-gps.png", QString{}, "view_menu.html");
 	move_to_gps_pos_act->setEnabled(false);