extra/qtcreator to 4.8.1-2

This commit is contained in:
Kevin Mihelich 2019-02-01 13:46:11 +00:00
parent f466cf2883
commit b915dee7b7
2 changed files with 15 additions and 11 deletions

View file

@ -14,10 +14,10 @@ buildarch=12
pkgname=qtcreator
pkgver=4.8.1
_clangver=7.0.1
pkgrel=1
pkgrel=2
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=(x86_64)
url='http://qt-project.org'
url='https://www.qt.io'
license=(LGPL)
depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine clang=$_clangver qbs clazy)
makedepends=(git mesa llvm python)
@ -31,10 +31,10 @@ optdepends=('qt5-doc: integrated Qt documentation'
'git: git support'
'mercurial: mercurial support'
'bzr: bazaar support')
source=("http://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
qtcreator-clang-plugins.patch)
sha256sums=('8f691de9b30b99dd44e010525ba9bf3054142a1082dc5273c46c533b91c07bd9'
'6f19fc9d83964a5460d224b3d44ce580553847960181fe0364e2ce26e1efd2e6')
'34ea74698ddff9925e06bff6b4c995bf93488d1104e8cc517bcfdd621effb428')
prepare() {
mkdir -p build

View file

@ -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());