diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-05 13:30:45 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-05 13:30:45 +0100 |
commit | de77642551baa8bc4a88727b41a14d7ea7713185 (patch) | |
tree | 0ae9e308509edcf4b1d4b6d944ed1567d0717c7c | |
parent | 3ba48ca11e16949ff84dd7289084e2f7b3327d5b (diff) | |
parent | 5b1a7f37560d24821e9bea705aaba26f71b604ab (diff) | |
download | qt-creator-de77642551baa8bc4a88727b41a14d7ea7713185.tar.gz |
Merge remote-tracking branch 'origin/3.4'
-rw-r--r-- | dist/changes-3.4.0 | 7 | ||||
-rw-r--r-- | plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in | 1 | ||||
-rw-r--r-- | plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp | 22 |
3 files changed, 14 insertions, 16 deletions
diff --git a/dist/changes-3.4.0 b/dist/changes-3.4.0 new file mode 100644 index 0000000000..894f4b0fea --- /dev/null +++ b/dist/changes-3.4.0 @@ -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) diff --git a/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in b/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in index 081dc1eef6..fc86ed513b 100644 --- a/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in +++ b/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in @@ -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\", diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index e0576299e4..c99060d13c 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -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(); } |