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

Merge remote-tracking branch 'origin/master' into 4.4

Browse Source 
Change-Id: I00fe351ee5f2689366c63ba94b042609c47da777
This commit is contained in:
Eike Ziller
2017-07-04 13:55:35 +02:00
parent ccef9c0294 3c6a2b7912
commit 526e40cba3
68 changed files with 733 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/callgrindtool.cpp
View File

@@ -272,7 +272,7 @@ CallgrindTool::CallgrindTool()
menu->addAction(ActionManager::registerAction(action, CallgrindRemoteActionId),
Debugger::Constants::G_ANALYZER_REMOTE_TOOLS);
QObject::connect(action, &QAction::triggered, this, [this, action] {
RunConfiguration *runConfig = startupRunConfiguration();
auto runConfig = RunConfiguration::startupRunConfiguration();
if (!runConfig) {
showCannotStartDialog(action->text());
return;