Merge branch '2.3'

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

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
This commit is contained in:
Oswald Buddenhagen
2011-07-29 17:57:59 +02:00
135 changed files with 7595 additions and 4403 deletions

View File

@@ -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()