libre/qtcreator: updated to 4.8.2

1 files changed, 11 insertions, 7 deletions

diff --git a/libre/qtcreator/qtcreator-clang-plugins.patch b/libre/qtcreator/qtcreator-clang-plugins.patch
index 2585f29db..5dc5b567a 100644
--- a/libre/qtcreator/qtcreator-clang-plugins.patch
+++ b/libre/qtcreator/qtcreator-clang-plugins.patch
@@ -10,14 +10,16 @@ index 25054f14ec..b0e17c3260 100644
          addXclangArg("-add-plugin", "clang-tidy");
  
          if (tidyMode == Mode::File)
-@@ -539,6 +540,7 @@ private:
+@@ -539,7 +540,8 @@ private:
          if (checks.isEmpty())
              return;
- 
-+        addXclangArg("-load", "ClangLazy.so");
-         addXclangArg("-add-plugin", "clang-lazy");
+
+-        addXclangArg("-add-plugin", "clang-lazy");
++        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);
 diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp
 index d91724392e..75e1692f49 100644
 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp
@@ -30,11 +32,13 @@ index d91724392e..75e1692f49 100644
          addXclangArg(arguments, QString("-add-plugin"), QString("clang-tidy"));
          if (tidyMode != ClangDiagnosticConfig::TidyMode::File) {
              const QString tidyChecks = m_diagnosticConfig.clangTidyChecks();
-@@ -92,6 +93,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
+@@ -92,7 +93,8 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis
  
      const QString clazyChecks = m_diagnosticConfig.clazyChecks();
      if (!clazyChecks.isEmpty()) {
-+        addXclangArg(arguments, QString("-load"), QString("ClangLazy.so"));
-         addXclangArg(arguments, QString("-add-plugin"), QString("clang-lazy"));
+-        addXclangArg(arguments, QString("-add-plugin"), QString("clang-lazy"));
++        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());