Merge branch '2.3'

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4

src/plugins/valgrind/callgrindengine.cpp

@@ -101,10 +101,10 @@ Valgrind::ValgrindRunner * CallgrindEngine::runner()
     return &m_runner;
 }
 
-void CallgrindEngine::start()
+bool CallgrindEngine::start()
 {
     emit outputReceived(tr("Profiling %1\n").arg(executable()), Utils::NormalMessageFormat);
-    ValgrindEngine::start();
+    return ValgrindEngine::start();
 }
 
 void CallgrindEngine::dump()

src/plugins/valgrind/callgrindengine.h

@@ -49,7 +49,7 @@ public:
     CallgrindEngine(Analyzer::IAnalyzerTool *tool, const Analyzer::AnalyzerStartParameters &sp,
         ProjectExplorer::RunConfiguration *runConfiguration);
 
-    void start();
+    bool start();
 
     Valgrind::Callgrind::ParseData *takeParserData();
 

src/plugins/valgrind/memcheckengine.cpp

@@ -75,13 +75,13 @@ Valgrind::ValgrindRunner *MemcheckEngine::runner()
     return &m_runner;
 }
 
-void MemcheckEngine::start()
+bool MemcheckEngine::start()
 {
     m_runner.setParser(&m_parser);
 
     emit outputReceived(tr("Analyzing memory of %1\n").arg(executable()),
                         Utils::NormalMessageFormat);
-    ValgrindEngine::start();
+    return ValgrindEngine::start();
 }
 
 void MemcheckEngine::stop()

src/plugins/valgrind/memcheckengine.h

@@ -51,7 +51,7 @@ public:
     MemcheckEngine(Analyzer::IAnalyzerTool *tool, const Analyzer::AnalyzerStartParameters &sp,
         ProjectExplorer::RunConfiguration *runConfiguration);
 
-    void start();
+    bool start();
     void stop();
 
     QStringList suppressionFiles() const;

src/plugins/valgrind/valgrindengine.cpp

@@ -77,7 +77,7 @@ ValgrindEngine::~ValgrindEngine()
     delete m_progress;
 }
 
-void ValgrindEngine::start()
+bool ValgrindEngine::start()
 {
     emit starting(this);
 
@@ -115,6 +115,8 @@ void ValgrindEngine::start()
         runner()->startRemotely(sp.connParams);
     else
         runner()->start();
+
+    return true;
 }
 
 void ValgrindEngine::stop()

src/plugins/valgrind/valgrindengine.h

@@ -63,7 +63,7 @@ public:
         ProjectExplorer::RunConfiguration *runConfiguration);
     ~ValgrindEngine();
 
-    void start();
+    bool start();
     void stop();
 
     QString executable() const;