Merge remote-tracking branch 'origin/4.3'

Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45

1 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp
index 8fe8d4e2a7..569b0d21f6 100644
--- a/src/plugins/valgrind/valgrindengine.cpp
+++ b/src/plugins/valgrind/valgrindengine.cpp
@@ -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