feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Change-Id: Ic7cba72e7bec10e4fc0099b97e3317e391a6aa5d
This commit is contained in:
Eike Ziller
2015-11-03 13:06:35 +01:00
parent 406d231f1b 62393af0ab
commit 81e9b96148
34 changed files with 469 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2494,8 +2494,8 @@ void DebuggerPluginPrivate::extensionsInitialized()
act = m_frameUpAction = new QAction(tr("Move to Calling Frame"), this);
connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::handleFrameUp);
connect(action(OperateByInstruction), SIGNAL(triggered(bool)),
SLOT(handleOperateByInstructionTriggered(bool)));
connect(action(OperateByInstruction), &QAction::triggered,
this, &DebuggerPluginPrivate::handleOperateByInstructionTriggered);
ActionContainer *debugMenu = ActionManager::actionContainer(PE::M_DEBUG);