summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorLucie Gérard <lucie.gerard@qt.io>2019-09-10 10:12:24 +0200
committerLucie Gérard <lucie.gerard@qt.io>2019-09-19 15:33:49 +0200
commitc7c081526a6d1c3d8ddf4bb89309956b06822cd6 (patch)
treec4c8490c42c481af278682f31654978f340b083d /configure.json
parent1bf494714cb63a613aab0d596c1f656738a45fa4 (diff)
lupdate: check for clang in environment
The configure.pri and configure.json files, originally located in qttools/src/qdoc, are moved to qttools/global. This makes the clang environment accessible to both qdoc and lupdate. Both files are adapted to the need of the new lupdate clang-based parser. (see https://wiki.qt.io/Lupdate_clang-based_c%2B%2B_parser#Clang-environment_and_Qt_configuration for details) Note: If the clang environment is not adapted to the upcoming lupdate clang-based parser, nothing will break, the new parser option will simply not be available. Nothing is changing for qdoc. Change-Id: I7297f5894ba7aee669865b0e89aaa298b311e07e Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.json b/configure.json
index cd111df83..190c23708 100644
--- a/configure.json
+++ b/configure.json
@@ -1,5 +1,5 @@
{
"subconfigs": [
- "src/qdoc"
+ "src/global"
]
}