Date: Friday, April 5, 2019 @ 13:43:24 Author: arojas Revision: 350085
Update plugin name for clazy 1.5 Modified: qtcreator/trunk/qtcreator-clang-plugins.patch -------------------------------+ qtcreator-clang-plugins.patch | 44 ++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 13 deletions(-) Modified: qtcreator-clang-plugins.patch =================================================================== --- qtcreator-clang-plugins.patch 2019-04-05 13:43:13 UTC (rev 350084) +++ qtcreator-clang-plugins.patch 2019-04-05 13:43:24 UTC (rev 350085) @@ -1,8 +1,8 @@ diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -index 25054f14ec..b0e17c3260 100644 +index 0738aa8e70..0ef27d9397 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -@@ -524,6 +524,7 @@ private: +@@ -525,6 +525,7 @@ private: if (tidyMode == Mode::Disabled) return; @@ -10,21 +10,33 @@ addXclangArg("-add-plugin", "clang-tidy"); if (tidyMode == Mode::File) -@@ -539,7 +540,8 @@ private: +@@ -540,15 +541,16 @@ private: if (checks.isEmpty()) return; - + - addXclangArg("-add-plugin", "clang-lazy"); +- addXclangArg("-plugin-arg-clang-lazy", "enable-all-fixits"); +- addXclangArg("-plugin-arg-clang-lazy", "no-autowrite-fixits"); +- addXclangArg("-plugin-arg-clang-lazy", checks); + addXclangArg("-load", "ClazyPlugin.so"); + addXclangArg("-add-plugin", "clazy"); - addXclangArg("-plugin-arg-clang-lazy", "enable-all-fixits"); - addXclangArg("-plugin-arg-clang-lazy", "no-autowrite-fixits"); - addXclangArg("-plugin-arg-clang-lazy", checks); ++ addXclangArg("-plugin-arg-clazy", "enable-all-fixits"); ++ addXclangArg("-plugin-arg-clazy", "no-autowrite-fixits"); ++ addXclangArg("-plugin-arg-clazy", checks); + + // NOTE: we already use -isystem for all include paths to make libclang skip diagnostics for + // all of them. That means that ignore-included-files will not change anything unless we decide + // to return the original -I prefix for some include paths. +- addXclangArg("-plugin-arg-clang-lazy", "ignore-included-files"); ++ addXclangArg("-plugin-arg-clazy", "ignore-included-files"); + } + + void addGlobalDiagnosticOptions() diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp -index d91724392e..75e1692f49 100644 +index 00a945c124..dcb0ad7280 100644 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -83,6 +83,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis +@@ -84,6 +84,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode(); if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) { @@ -32,13 +44,19 @@ addXclangArg(arguments, QString("-add-plugin"), QString("clang-tidy")); if (tidyMode != ClangDiagnosticConfig::TidyMode::File) { const QString tidyChecks = m_diagnosticConfig.clangTidyChecks(); -@@ -92,7 +93,8 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis +@@ -93,10 +94,11 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis const QString clazyChecks = m_diagnosticConfig.clazyChecks(); if (!clazyChecks.isEmpty()) { - addXclangArg(arguments, QString("-add-plugin"), QString("clang-lazy")); +- addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("enable-all-fixits")); +- addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("no-autowrite-fixits")); +- addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), m_diagnosticConfig.clazyChecks()); + addXclangArg(arguments, QString("-load"), QString("ClazyPlugin.so")); + addXclangArg(arguments, QString("-add-plugin"), QString("clazy")); - addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("enable-all-fixits")); - addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), QString("no-autowrite-fixits")); - addXclangArg(arguments, QString("-plugin-arg-clang-lazy"), m_diagnosticConfig.clazyChecks()); ++ addXclangArg(arguments, QString("-plugin-arg-clazy"), QString("enable-all-fixits")); ++ addXclangArg(arguments, QString("-plugin-arg-clazy"), QString("no-autowrite-fixits")); ++ addXclangArg(arguments, QString("-plugin-arg-clazy"), m_diagnosticConfig.clazyChecks()); + } + + arguments += options;