From f6eb83490a3f4a793eea1dad3d0d23e4d2fc801c Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Wed, 29 Oct 2014 10:40:00 +0100
Subject: [PATCH] RunControl: Announce starting and finishing in Application
output pane
Change-Id: I040f848dbdd6ef92ce03525e91c4b536390df9b4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
.../clangstaticanalyzerruncontrol.cpp | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index 86939bdfd9e..e0c7b11e716 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
@@ -90,12 +90,16 @@ bool ClangStaticAnalyzerRunControl::startEngine()
Project *project = target->project();
QTC_ASSERT(project, emit finished(); return false);
+ const QString projectFile = project->projectFilePath().toString();
+ appendMessage(tr("Running Clang Static Analyzer on %1").arg(projectFile) + QLatin1Char('\n'),
+ Utils::NormalMessageFormat);
+
// Check clang executable
bool isValidClangExecutable;
const QString executable = clangExecutableFromSettings(&isValidClangExecutable);
if (!isValidClangExecutable) {
- emit appendMessage(tr("Clang Static Analyzer: Invalid executable \"%1\", stop.\n")
- .arg(executable),
+ emit appendMessage(tr("Clang Static Analyzer: Invalid executable \"%1\", stop.")
+ .arg(executable) + QLatin1Char('\n'),
Utils::ErrorMessageFormat);
emit finished();
return false;
@@ -106,8 +110,8 @@ bool ClangStaticAnalyzerRunControl::startEngine()
QTemporaryDir temporaryDir(QDir::tempPath() + QLatin1String("/qtc-clangstaticanalyzer-XXXXXX"));
temporaryDir.setAutoRemove(false);
if (!temporaryDir.isValid()) {
- emit appendMessage(tr("Clang Static Analyzer: Failed to create temporary dir, stop.\n"),
- Utils::ErrorMessageFormat);
+ emit appendMessage(tr("Clang Static Analyzer: Failed to create temporary dir, stop.")
+ + QLatin1Char('\n'), Utils::ErrorMessageFormat);
emit finished();
return false;
}
@@ -162,6 +166,8 @@ void ClangStaticAnalyzerRunControl::analyzeNextFile()
if (m_filesToProcess.isEmpty()) {
if (m_runners.size() == 0) {
+ appendMessage(tr("Clang Static Analyzer finished.") + QLatin1Char('\n'),
+ Utils::NormalMessageFormat);
m_progress.reportFinished();
emit finished();
}
@@ -199,6 +205,7 @@ void ClangStaticAnalyzerRunControl::onRunnerFinishedWithSuccess(const QString &l
QString errorMessage;
const QList<Diagnostic> diagnostics = LogFileReader::read(logFilePath, &errorMessage);
+ QTC_CHECK(errorMessage.isEmpty());
if (!errorMessage.isEmpty())
qCDebug(LOG) << "onRunnerFinishedWithSuccess: Error reading log file:" << errorMessage;
if (!diagnostics.isEmpty())
--
GitLab