Avoid shortcuts with "Alt" on macOS

On macOS shortcuts with "Alt" are used for entering special
characters, where "special" depends on keyboard layout and can
mean e.g. '|' or '~'.

Task-number: QTCREATORBUG-20873
Change-Id: Ifa70b95381ef48d2ba3b15a528a5dcfe43d53bfd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

2 files changed, 14 insertions, 8 deletions

diff --git a/src/plugins/autotest/autotestplugin.cpp b/src/plugins/autotest/autotestplugin.cpp
index 61148f7557..a4ae1ffa45 100644
--- a/src/plugins/autotest/autotestplugin.cpp
+++ b/src/plugins/autotest/autotestplugin.cpp
@@ -110,7 +110,8 @@ void AutotestPlugin::initializeMenuEntries()
     action->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon());
     action->setToolTip(tr("Run All Tests"));
     Command *command = ActionManager::registerAction(action, Constants::ACTION_RUN_ALL_ID);
-    command->setDefaultKeySequence(QKeySequence(tr("Alt+Shift+T,Alt+A")));
+    command->setDefaultKeySequence(
+        QKeySequence(useMacShortcuts ? tr("Ctrl+Meta+T, Ctrl+Meta+A") : tr("Alt+Shift+T,Alt+A")));
     connect(action, &QAction::triggered, this, &AutotestPlugin::onRunAllTriggered);
     action->setEnabled(false);
     menu->addAction(command);
@@ -122,7 +123,8 @@ void AutotestPlugin::initializeMenuEntries()
     action->setIcon(runSelectedIcon.icon());
     action->setToolTip(tr("Run Selected Tests"));
     command = ActionManager::registerAction(action, Constants::ACTION_RUN_SELECTED_ID);
-    command->setDefaultKeySequence(QKeySequence(tr("Alt+Shift+T,Alt+R")));
+    command->setDefaultKeySequence(
+        QKeySequence(useMacShortcuts ? tr("Ctrl+Meta+T, Ctrl+Meta+R") : tr("Alt+Shift+T,Alt+R")));
     connect(action, &QAction::triggered, this, &AutotestPlugin::onRunSelectedTriggered);
     action->setEnabled(false);
     menu->addAction(command);
@@ -134,15 +136,17 @@ void AutotestPlugin::initializeMenuEntries()
     action->setIcon(runFileIcon.icon());
     action->setToolTip(tr("Run Tests for Current File"));
     command = ActionManager::registerAction(action, Constants::ACTION_RUN_FILE_ID);
-    command->setDefaultKeySequence(QKeySequence(tr("Alt+Shift+T,Alt+F")));
+    command->setDefaultKeySequence(
+        QKeySequence(useMacShortcuts ? tr("Ctrl+Meta+T, Ctrl+Meta+F") : tr("Alt+Shift+T,Alt+F")));
     connect(action, &QAction::triggered, this, &AutotestPlugin::onRunFileTriggered);
     action->setEnabled(false);
     menu->addAction(command);
 
     action = new QAction(tr("Re&scan Tests"), this);
     command = ActionManager::registerAction(action, Constants::ACTION_SCAN_ID);
-    command->setDefaultKeySequence(QKeySequence(tr("Alt+Shift+T,Alt+S")));
-    connect(action, &QAction::triggered, this, [] () {
+    command->setDefaultKeySequence(
+        QKeySequence(useMacShortcuts ? tr("Ctrl+Meta+T, Ctrl+Meta+S") : tr("Alt+Shift+T,Alt+S")));
+    connect(action, &QAction::triggered, this, []() {
         TestTreeModel::instance()->parser()->updateTestTree();
     });
     menu->addAction(command);
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 688c7b245c..7f8bc423a1 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -259,9 +259,11 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) : QWidget(parent)
     if (!ActionManager::command(focusActionId)) {
         auto focusDocumentInProjectTree = new QAction(tr("Focus Document in Project Tree"), this);
         Command *cmd = ActionManager::registerAction(focusDocumentInProjectTree, focusActionId);
-        cmd->setDefaultKeySequence(QKeySequence(tr("Alt+Shift+L")));
-        connect(focusDocumentInProjectTree, &QAction::triggered,
-                this, [this]() { syncFromDocumentManager(); });
+        cmd->setDefaultKeySequence(
+            QKeySequence(useMacShortcuts ? tr("Meta+Shift+L") : tr("Alt+Shift+L")));
+        connect(focusDocumentInProjectTree, &QAction::triggered, this, [this]() {
+            syncFromDocumentManager();
+        });
     }
 
     m_trimEmptyDirectoriesAction = new QAction(tr("Hide Empty Directories"), this);