Merge remote-tracking branch 'origin/3.5'

Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
This commit is contained in:
Eike Ziller
2015-09-01 12:57:51 +02:00
62 changed files with 2582 additions and 2354 deletions

View File

@@ -1759,6 +1759,7 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
m_inspectorView->setModel(engine->watchModel());
engine->watchHandler()->resetWatchers();
m_localsView->hideProgressIndicator();
m_mainWindow->setEngineDebugLanguages(engine->runParameters().languages);
}