diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2020-11-23 08:21:51 +0000 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2020-11-23 09:35:08 +0100 |
| commit | 2a41769b64c166b5a93d1046e030fe22dc0834eb (patch) | |
| tree | 70ade24453733607ee8ec6ede3dfa556380203d3 /configure.json | |
| parent | 6ea90064cb46470f8f5e3f12e1337ca4af4ee304 (diff) | |
Revert "Exclude assistant from build"
This reverts commit 7aeec24a9b8c00ee56891e4037406eca8271aa4d.
Reason for revert: See discussion in QTBUG-86746
Pick-to: 6.0.0 6.0
Change-Id: I9e9cc95513a1b9b3685b10b262ae2ee7334caf69
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/configure.json b/configure.json index 285cafecc..4b8e64e79 100644 --- a/configure.json +++ b/configure.json @@ -14,6 +14,11 @@ } }, "features": { + "assistant": { + "label": "Qt Assistant", + "purpose": "Qt Assistant is a tool for viewing on-line documentation in Qt help file format.", + "output": [ "privateFeature" ] + }, "clang": { "label": "QDoc", "condition": "tests.libclang", @@ -47,11 +52,6 @@ "purpose": "The Qt Distance Field Generator tool can be used to pregenerate the font cache in order to optimize startup performance.", "output": [ "privateFeature" ] }, - "help": { - "label": "Qt Help", - "purpose": "Qt Help is a library for accessing help contents to be able to integrate online help into Qt applications.", - "output": [ "privateFeature" ] - }, "kmap2qmap": { "label": "kmap2qmap", "purpose": "kmap2qmap is a tool to generate keymaps for use on Embedded Linux. The source files have to be in standard Linux kmap format that is e.g. understood by the kernel's loadkeys command.", @@ -129,11 +129,11 @@ On macOS, you can use Homebrew's llvm package." { "section": "Qt Tools", "entries": [ + "assistant", "clang", "clangcpp", "designer", "distancefieldgenerator", - "help", "kmap2qmap", "linguist", "macdeployqt", |