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

Merge remote-tracking branch 'origin/4.0'

Browse Source 
Change-Id: If0ba896a083392a532f76bb26bec3540a7c17667
This commit is contained in:
Eike Ziller
2016-04-25 13:27:09 +02:00
parent 452ea6a662 728229690a
commit a3880c4916
60 changed files with 451 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -116,7 +116,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngi
m_engine(engine),
m_running(false)
{
setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL);
setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL_TOOLBAR);
connect(this, &RunControl::finished, this, &DebuggerRunControl::handleFinished);
connect(engine, &DebuggerEngine::requestRemoteSetup,