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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45
This commit is contained in:
Orgad Shaneh
2017-06-02 15:03:36 +03:00
parent a9d511ff7d ec3015663a
commit 89057b552b
38 changed files with 225 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -87,7 +87,8 @@ void ValgrindToolRunner::start()
run->setValgrindExecutable(m_settings->valgrindExecutable());
run->setValgrindArguments(genericToolArguments() + toolArguments());
run->setDevice(device());
run->setDebuggee(runControl()->runnable().as<StandardRunnable>());
if (runControl()->runnable().is<StandardRunnable>())
run->setDebuggee(runControl()->runnable().as<StandardRunnable>());
connect(run, &ValgrindRunner::processOutputReceived,
this, &ValgrindToolRunner::receiveProcessOutput);
@@ -113,7 +114,9 @@ void ValgrindToolRunner::stop()
QString ValgrindToolRunner::executable() const
{
return runControl()->runnable().as<StandardRunnable>().executable;
const Runnable &runnable = runControl()->runnable();
return runnable.is<StandardRunnable>() ?
runnable.as<StandardRunnable>().executable : QString();
}
QStringList ValgrindToolRunner::genericToolArguments() const