diff options
Diffstat (limited to 'qtcreator-clang-plugins.patch')
| -rw-r--r-- | qtcreator-clang-plugins.patch | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/qtcreator-clang-plugins.patch b/qtcreator-clang-plugins.patch index 1e4735cdede5..791c32781b7f 100644 --- a/qtcreator-clang-plugins.patch +++ b/qtcreator-clang-plugins.patch @@ -1,47 +1,43 @@ -diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -index 706c5101a3..0f7af62dba 100644 ---- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp -@@ -511,6 +511,7 @@ private: +diff '--color=auto' --unified --recursive --text qt-creator.orig/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp qt-creator.new/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +--- qt-creator.orig/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp 2019-05-03 16:09:59.000000000 -0300 ++++ qt-creator.new/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp 2019-05-03 15:57:36.000000000 -0300 +@@ -511,6 +511,7 @@ if (tidyMode == Mode::Disabled) return; - + + m_options.append(CppTools::XclangArgs({"-load", "libclangTidyPlugin.so"})); m_options.append(CppTools::XclangArgs({"-add-plugin", "clang-tidy"})); - + if (tidyMode == Mode::File) -@@ -526,8 +527,8 @@ private: +@@ -526,8 +527,8 @@ if (checks.isEmpty()) return; - + - m_options.append(CppTools::XclangArgs({"-add-plugin", -- "clang-lazy", +- "clazy", + m_options.append(CppTools::XclangArgs({"-load", "ClazyPlugin.so", -+ "-add-plugin", "clazy", - "-plugin-arg-clang-lazy", ++ "-add-plugin", "clazy", + "-plugin-arg-clazy", "enable-all-fixits", - "-plugin-arg-clang-lazy", -diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clangtools/clangtidyclazyrunner.cpp -index a580704243..42c4319240 100644 ---- a/src/plugins/clangtools/clangtidyclazyrunner.cpp -+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -76,6 +76,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis - + "-plugin-arg-clazy", +diff '--color=auto' --unified --recursive --text qt-creator.orig/src/plugins/clangtools/clangtidyclazyrunner.cpp qt-creator.new/src/plugins/clangtools/clangtidyclazyrunner.cpp +--- qt-creator.orig/src/plugins/clangtools/clangtidyclazyrunner.cpp 2019-05-03 16:09:59.000000000 -0300 ++++ qt-creator.new/src/plugins/clangtools/clangtidyclazyrunner.cpp 2019-05-03 16:02:39.000000000 -0300 +@@ -76,6 +76,7 @@ + const ClangDiagnosticConfig::TidyMode tidyMode = m_diagnosticConfig.clangTidyMode(); if (tidyMode != ClangDiagnosticConfig::TidyMode::Disabled) { + arguments << XclangArgs({"-load", "libclangTidyPlugin.so"}); arguments << XclangArgs({"-add-plugin", "clang-tidy"}); if (tidyMode != ClangDiagnosticConfig::TidyMode::File) { const QString tidyChecks = m_diagnosticConfig.clangTidyChecks(); -@@ -85,8 +86,9 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis - +@@ -85,7 +86,8 @@ + const QString clazyChecks = m_diagnosticConfig.clazyChecks(); if (!clazyChecks.isEmpty()) { - arguments << XclangArgs({"-add-plugin", -- "clang-lazy", + arguments << XclangArgs({"-load", "ClazyPlugin.so", -+ "-add-plugin", -+ "clazy", - "-plugin-arg-clang-lazy", ++ "-add-plugin", + "clazy", + "-plugin-arg-clazy", "enable-all-fixits", - "-plugin-arg-clang-lazy",
\ No newline at end of file |