aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md19
-rw-r--r--tools/qbs/GitRepo.js2
2 files changed, 20 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f9869de..f5207e5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -69,4 +69,23 @@ You can use [clazy](clazy-git) to check Qt semantics. Requires clang.
To easily set check levels, set the CLAZY_CHECKS environment variable to
'level0,level1', etc.
+#### Reducing clazy noise
+If you want to suppress warnings from headers of Qt or 3rd party code, include
+them with -isystem instead of -I. To do this, you have to
+[modify your Qt profile](clazy-sysincludes) like this:
+
+Find the profile's search path:
+```sh
+$ qbs config --list profiles.qt562.preferences
+profiles.qt562.preferences.qbsSearchPaths: "/home/someone/.config/QtProject/qbs/1.9.0/profiles/qt562"
+```
+
+Replace cpp.includePaths with cpp.systemIncludePaths in the Qt modules of that
+profile:
+
+```sh
+$ find /home/someone/.config/QtProject/qbs/1.9.0/profiles/qt562/modules/Qt/ -name '*.qbs' | xargs -n1 sed -i s/cpp\.includePaths/cpp.systemIncludePaths/
+```
+
[clazy-git]: https://github.com/KDE/clazy
+[clazy-sysincludes]: http://lists.qt-project.org/pipermail/qbs/2017-April/001709.html
diff --git a/tools/qbs/GitRepo.js b/tools/qbs/GitRepo.js
index d7e19a7..e5ecb03 100644
--- a/tools/qbs/GitRepo.js
+++ b/tools/qbs/GitRepo.js
@@ -8,7 +8,7 @@ function read(workingDirectory) {
git.exec("git", ["describe", "--abbrev=0", "--tag"], true);
meta.version = git.readLine();
- git.exec("git", ["describe", "--tag"], true);
+ git.exec("git", ["describe", "--long"], true);
meta.describe = git.readLine();
return meta;