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

Fix crash when using Valgrind for iOS & Android

Browse Source 
Task-number: QTCREATORBUG-18254
Change-Id: I49a20edafa1d241c83a301ce9652a6fb839bed93
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Vikas Pachdha
2017-05-29 10:10:54 +02:00
parent 1e1253b5a7
commit 1c54b84855
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,9 +89,13 @@ void ValgrindRunControl::start()
ValgrindRunner *run = runner(); ValgrindRunner *run = runner();
run->setValgrindExecutable(m_settings->valgrindExecutable()); run->setValgrindExecutable(m_settings->valgrindExecutable());
run->setValgrindArguments(genericToolArguments() + toolArguments()); run->setValgrindArguments(genericToolArguments() + toolArguments());
const StandardRunnable r = runnable().as<StandardRunnable>(); if (runnable().is<StandardRunnable>()) {
run->setDevice(r.device ? r.device : device()); const StandardRunnable r = runnable().as<StandardRunnable>();
run->setDebuggee(r); run->setDevice(r.device ? r.device : device());
run->setDebuggee(r);
} else {
run->setDevice(device());
}
connect(run, &ValgrindRunner::processOutputReceived, connect(run, &ValgrindRunner::processOutputReceived,
this, &ValgrindRunControl::receiveProcessOutput); this, &ValgrindRunControl::receiveProcessOutput);
@@ -116,7 +120,8 @@ RunControl::StopResult ValgrindRunControl::stop()
QString ValgrindRunControl::executable() const QString ValgrindRunControl::executable() const
{ {
return runnable().as<StandardRunnable>().executable; return runnable().is<StandardRunnable>() ?
runnable().as<StandardRunnable>().executable : QString();
} }
QStringList ValgrindRunControl::genericToolArguments() const QStringList ValgrindRunControl::genericToolArguments() const