OSDN Git Service

Another shortcut conflict less on Mac OS.
authorcon <qtc-committer@nokia.com>
Mon, 25 Oct 2010 11:18:44 +0000 (13:18 +0200)
committercon <qtc-committer@nokia.com>
Mon, 25 Oct 2010 11:19:08 +0000 (13:19 +0200)
Reviewed-by: Joerg Bornemann
src/plugins/projectexplorer/projectexplorer.cpp

index b43d46b..bdb9d1a 100644 (file)
@@ -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