From c9d6889815a89a1cb0f763c570f3dc6b3c00b02a Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 25 Oct 2010 13:18:44 +0200
Subject: [PATCH] Another shortcut conflict less on Mac OS.
Reviewed-by: Joerg Bornemann
---
src/plugins/projectexplorer/projectexplorer.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index b43d46bd970..bdb9d1a7375 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -492,7 +492,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
// open action
d->m_loadAction = new QAction(tr("Load Project..."), this);
cmd = am->registerAction(d->m_loadAction, Constants::LOAD, globalcontext);
+#ifndef Q_WS_MAC
cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+O")));
+#endif
msessionContextMenu->addAction(cmd, Constants::G_SESSION_FILES);
// Default open action
--
GitLab