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

Valgrind: Adapt to Analyzer base changes

Browse Source 
Change-Id: I27ef2465591421378794c982b4df8d40cb9cb87c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2016-01-20 08:24:02 +01:00
parent 2053e77e38
commit d64f27f738
2 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/valgrind/valgrindplugin.cpp
View File

@@ -131,12 +131,9 @@ void ValgrindPlugin::extensionsInitialized()
auto mcWidgetCreator = [mcTool] { return mcTool->createWidgets(); };
auto cgTool = new CallgrindTool(this);
auto cgWidgetCreator = [cgTool] { return cgTool->createWidgets(); };
auto cgRunControlCreator = [cgTool](const AnalyzerStartParameters &sp,
auto cgRunControlCreator = [cgTool](const AnalyzerStartParameters &,
RunConfiguration *runConfiguration, Core::Id) {
auto runControl = cgTool->createRunControl(runConfiguration);
runControl->setRunnable(AnalyzerRunnable(sp));
runControl->setConnection(AnalyzerConnection(sp));
return runControl;
return cgTool->createRunControl(runConfiguration);
};
if (!Utils::HostOsInfo::isWindowsHost()) {
@@ -144,13 +141,9 @@ void ValgrindPlugin::extensionsInitialized()
action->setActionId("Memcheck.Local");
action->setToolId("Memcheck");
action->setWidgetCreator(mcWidgetCreator);
action->setRunControlCreator([mcTool](const AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode)
{
auto runControl = mcTool->createRunControl(runConfig, runMode);
runControl->setRunnable(AnalyzerRunnable(sp));
runControl->setConnection(AnalyzerConnection(sp));
return runControl;
action->setRunControlCreator([mcTool](const AnalyzerStartParameters &,
ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode) {
return mcTool->createRunControl(runConfig, runMode);
});
action->setToolMode(DebugMode);
action->setRunMode(MEMCHECK_RUN_MODE);
@@ -165,13 +158,9 @@ void ValgrindPlugin::extensionsInitialized()
action->setActionId("MemcheckWithGdb.Local");
action->setToolId("MemcheckWithGdb");
action->setWidgetCreator([mcgTool] { return mcgTool->createWidgets(); });
action->setRunControlCreator([mcgTool](const AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode)
{
auto runControl = mcgTool->createRunControl(runConfig, runMode);
runControl->setRunnable(AnalyzerRunnable(sp));
runControl->setConnection(AnalyzerConnection(sp));
return runControl;
action->setRunControlCreator([mcgTool](const AnalyzerStartParameters &,
ProjectExplorer::RunConfiguration *runConfig, Core::Id runMode) {
return mcgTool->createRunControl(runConfig, runMode);
});
action->setToolMode(DebugMode);
action->setRunMode(MEMCHECK_WITH_GDB_RUN_MODE);