diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD index 331fc50ba..10c445586 100644 --- a/extra/qtcreator/PKGBUILD +++ b/extra/qtcreator/PKGBUILD @@ -12,7 +12,7 @@ buildarch=12 pkgname=qtcreator -pkgver=4.10.2 +pkgver=4.11.0 _clangver=9.0.0 pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' @@ -34,8 +34,8 @@ optdepends=('qt5-doc: integrated Qt documentation' 'perf: performer analyzer') source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz" qtcreator-preload-plugins.patch) -sha256sums=('9add6bdddfe5726bb02535409c2ed788b1afeee082121f54f887281d0e3c449a' - '150c444e76ec969fc8765774b648984037829623300d0ce9d41a915b2afa792d') +sha256sums=('efebaa1c52526bf9c07b35c43071735c5d0b83b6cd08daab35a21e7ed53a7645' + 'd6f979c820e2294653f4f1853af96942bf25ff9fe9450657d45ff1c7f02bbca7') prepare() { mkdir -p build diff --git a/extra/qtcreator/qtcreator-preload-plugins.patch b/extra/qtcreator/qtcreator-preload-plugins.patch index f4772dd05..23b2dfa3f 100644 --- a/extra/qtcreator/qtcreator-preload-plugins.patch +++ b/extra/qtcreator/qtcreator-preload-plugins.patch @@ -2,20 +2,12 @@ diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp b/src/plugins/clang index a580704243..7a8740a5cc 100644 --- a/src/plugins/clangtools/clangtidyclazyrunner.cpp +++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp -@@ -76,6 +76,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis +@@ -63,7 +63,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis - 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,7 +86,7 @@ QStringList ClangTidyClazyRunner::constructCommandLineArguments(const QStringLis - - const QString clazyChecks = m_diagnosticConfig.clazyChecks(); + const QString clazyChecks = diagnosticConfig.clazyChecks(); if (!clazyChecks.isEmpty()) { - arguments << XclangArgs({"-add-plugin", + arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", "clazy", "-plugin-arg-clazy", - "enable-all-fixits", + diagnosticConfig.clazyChecks()});