diff options
| author | Lucie Gérard <lucie.gerard@qt.io> | 2019-09-10 10:12:24 +0200 |
|---|---|---|
| committer | Lucie Gérard <lucie.gerard@qt.io> | 2019-09-19 15:33:49 +0200 |
| commit | c7c081526a6d1c3d8ddf4bb89309956b06822cd6 (patch) | |
| tree | c4c8490c42c481af278682f31654978f340b083d /src/src.pro | |
| parent | 1bf494714cb63a613aab0d596c1f656738a45fa4 (diff) | |
| download | qttools-c7c081526a6d1c3d8ddf4bb89309956b06822cd6.tar.gz | |
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 'src/src.pro')
| -rw-r--r-- | src/src.pro | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/src.pro b/src/src.pro index 5c256ea3b..90b43b4cd 100644 --- a/src/src.pro +++ b/src/src.pro @@ -23,9 +23,10 @@ qtConfig(library) { !android|android_app: SUBDIRS += qtplugininfo } -include($$OUT_PWD/qdoc/qtqdoc-config.pri) -QT_FOR_CONFIG += qdoc-private -qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc +SUBDIRS += global +include($$OUT_PWD/global/qttools-config.pri) +QT_FOR_CONFIG += tools-private +qtConfig(clang): qtConfig(thread): SUBDIRS += qdoc !android|android_app: SUBDIRS += qtpaths |