diff options
| author | Eike Ziller <[email protected]> | 2014-09-03 16:07:46 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2014-09-03 16:08:02 +0200 |
| commit | 49db3a450a6d15ae0327b8e3713920ac19320972 (patch) | |
| tree | 309c83eb1dbb6321845d6a1db8fbc49428b20340 /src/plugins/debugger/debuggerplugin.cpp | |
| parent | afd56bd8ada761b87c40d80a07cd3b3766b2d2f8 (diff) | |
| parent | d030a960a0e6e1dda89e20b60e5252842fe83f49 (diff) | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/coreplugin/editormanager/editormanager.cpp
src/plugins/cppeditor/cppeditor.cpp
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
src/plugins/texteditor/basetexteditor.cpp
Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
Diffstat (limited to 'src/plugins/debugger/debuggerplugin.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index bd4b2ea1036..6a9884218c3 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3079,7 +3079,6 @@ void DebuggerPluginPrivate::extensionsInitialized() cmd = ActionManager::registerAction(m_resetAction, Constants::RESET, globalcontext); cmd->setDescription(tr("Restart Debugging")); - cmd->setDefaultKeySequence(QKeySequence(tr("Shift+Ctrl+R"))); debugMenu->addAction(cmd, CC::G_DEFAULT_ONE); debugMenu->addSeparator(globalcontext); |