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.cmake | |
| parent | 6ea90064cb46470f8f5e3f12e1337ca4af4ee304 (diff) | |
| download | qttools-2a41769b64c166b5a93d1046e030fe22dc0834eb.tar.gz | |
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.cmake')
| -rw-r--r-- | configure.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.cmake b/configure.cmake index 13e84b839..f895eb30c 100644 --- a/configure.cmake +++ b/configure.cmake @@ -27,6 +27,10 @@ endif() #### Features +qt_feature("assistant" PRIVATE + LABEL "Qt Assistant" + PURPOSE "Qt Assistant is a tool for viewing on-line documentation in Qt help file format." +) qt_feature("clang" PRIVATE LABEL "QDoc" CONDITION TEST_libclang @@ -43,10 +47,6 @@ qt_feature("distancefieldgenerator" PRIVATE LABEL "Qt Distance Field Generator" PURPOSE "The Qt Distance Field Generator tool can be used to pregenerate the font cache in order to optimize startup performance." ) -qt_feature("help" PRIVATE - LABEL "Qt Help" - PURPOSE "Qt Help is a library for accessing help contents to be able to integrate online help into Qt applications." -) qt_feature("kmap2qmap" PRIVATE 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." @@ -94,11 +94,11 @@ qt_feature("windeployqt" PRIVATE CONDITION WIN32 ) qt_configure_add_summary_section(NAME "Qt Tools") +qt_configure_add_summary_entry(ARGS "assistant") qt_configure_add_summary_entry(ARGS "clang") qt_configure_add_summary_entry(ARGS "clangcpp") qt_configure_add_summary_entry(ARGS "designer") qt_configure_add_summary_entry(ARGS "distancefieldgenerator") -qt_configure_add_summary_entry(ARGS "help") qt_configure_add_summary_entry(ARGS "kmap2qmap") qt_configure_add_summary_entry(ARGS "linguist") qt_configure_add_summary_entry(ARGS "macdeployqt") |