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

@@ -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;