feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Conflicts:
	plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp

Change-Id: I0362a5bb2a44c2608c2c074df45fffa022446cc4
This commit is contained in:
Eike Ziller
2015-05-07 14:40:11 +02:00
parent 1a122c2e25 59e01e2a89
commit d5956e92ed
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
View File

@@ -222,7 +222,7 @@ void ClangStaticAnalyzerTool::startTool()
AnalyzerManager::showMode();
Project *project = SessionManager::startupProject();
QTC_ASSERT(project, return);
QTC_ASSERT(project, emit finished(false); return);
if (dontStartAfterHintForDebugMode(project))
return;
@@ -231,7 +231,7 @@ void ClangStaticAnalyzerTool::startTool()
setBusyCursor(true);
m_diagnosticFilterModel->setProject(project);
m_projectInfoBeforeBuild = CppTools::CppModelManager::instance()->projectInfo(project);
QTC_ASSERT(m_projectInfoBeforeBuild.isValid(), return);
QTC_ASSERT(m_projectInfoBeforeBuild.isValid(), emit finished(false); return);
m_running = true;
handleStateUpdate();
@@ -284,7 +284,7 @@ void ClangStaticAnalyzerTool::onEngineFinished()
resetCursorAndProjectInfoBeforeBuild();
m_running = false;
handleStateUpdate();
emit finished();
emit finished(static_cast<ClangStaticAnalyzerRunControl *>(sender())->success());
}
void ClangStaticAnalyzerTool::setBusyCursor(bool busy)