Merge remote-tracking branch 'origin/3.4'

This commit is contained in:
Eike Ziller
2015-03-05 13:30:45 +01:00
3 changed files with 14 additions and 16 deletions

7
dist/changes-3.4.0 vendored Normal file
View File

@@ -0,0 +1,7 @@
Clang Static Analyzer 3.4.0
* Removed experimental state
* Added support for MSVC (requires Clang 3.6 or later)
* Added support for MinGW
* Added support for suppressing diagnostics
(added tool button in diagnostics view, and option pane in Projects mode)

View File

@@ -2,7 +2,6 @@
\"Name\" : \"ClangStaticAnalyzer\",
\"Version\" : \"$$QTCREATOR_VERSION\",
\"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
\"Experimental\" : true,
\"Vendor\" : \"The Qt Company Ltd\",
\"Copyright\" : \"(C) 2015 The Qt Company Ltd\",
\"License\" : [ \"Commercial Usage\",

View File

@@ -23,8 +23,8 @@
#include "clangstaticanalyzersettings.h"
#include "clangstaticanalyzerutils.h"
#include <analyzerbase/analyzerconstants.h>
#include <analyzerbase/analyzermanager.h>
#include <analyzerbase/analyzerutils.h>
#include <clangcodemodel/clangutils.h>
@@ -53,14 +53,6 @@ static Q_LOGGING_CATEGORY(LOG, "qtc.clangstaticanalyzer.runcontrol")
namespace ClangStaticAnalyzer {
namespace Internal {
static void logToIssuesPane(Task::TaskType type, const QString &message)
{
TaskHub::addTask(type, message, Analyzer::Constants::ANALYZERTASK_ID);
if (type == Task::Error)
TaskHub::requestPopup();
}
ClangStaticAnalyzerRunControl::ClangStaticAnalyzerRunControl(
const Analyzer::AnalyzerStartParameters &startParams,
ProjectExplorer::RunConfiguration *runConfiguration,
@@ -204,7 +196,7 @@ bool ClangStaticAnalyzerRunControl::startEngine()
const QString errorMessage = tr("Clang Static Analyzer: Invalid executable \"%1\", stop.")
.arg(executable);
appendMessage(errorMessage + QLatin1Char('\n'), Utils::ErrorMessageFormat);
logToIssuesPane(Task::Error, errorMessage);
AnalyzerUtils::logToIssuesPane(Task::Error, errorMessage);
emit finished();
return false;
}
@@ -217,7 +209,7 @@ bool ClangStaticAnalyzerRunControl::startEngine()
const QString errorMessage
= tr("Clang Static Analyzer: Failed to create temporary dir, stop.");
appendMessage(errorMessage + QLatin1Char('\n'), Utils::ErrorMessageFormat);
logToIssuesPane(Task::Error, errorMessage);
AnalyzerUtils::logToIssuesPane(Task::Error, errorMessage);
emit finished();
return false;
}
@@ -287,8 +279,8 @@ void ClangStaticAnalyzerRunControl::analyzeNextFile()
+ QLatin1Char('\n'),
Utils::NormalMessageFormat);
if (m_filesAnalyzed == 0 && m_filesNotAnalyzed != 0) {
logToIssuesPane(Task::Error,
tr("Clang Static Analyzer: Failed to analyze any files."));
AnalyzerUtils::logToIssuesPane(Task::Error,
tr("Clang Static Analyzer: Failed to analyze any files."));
}
m_progress.reportFinished();
emit finished();
@@ -353,8 +345,8 @@ void ClangStaticAnalyzerRunControl::onRunnerFinishedWithFailure(const QString &e
+ QLatin1Char('\n')
, Utils::StdErrFormat);
appendMessage(errorDetails, Utils::StdErrFormat);
logToIssuesPane(Task::Warning, errorMessage);
logToIssuesPane(Task::Warning, errorDetails);
AnalyzerUtils::logToIssuesPane(Task::Warning, errorMessage);
AnalyzerUtils::logToIssuesPane(Task::Warning, errorDetails);
handleFinished();
}