summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-20 23:38:32 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-20 23:38:33 +0200
commitcf6d6214b45c462ead9912ba1a6a637865f10a9b (patch)
treeecc9e12ad3b98a584aacaf5f4a4c714cd4220411
parentd690a99b99ce68cee6bde71e12a3fc6190812f3f (diff)
parent676b08f947098a3dd3d417a38631567157c4e757 (diff)
downloadqttools-cf6d6214b45c462ead9912ba1a6a637865f10a9b.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie46e3fab55d3641f058446c35e8333d2d6626b54
-rw-r--r--src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
index c964493bc..d1d941a4f 100644
--- a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
+++ b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
@@ -638,6 +638,10 @@
install the \c libclang-dev package and its dependencies. For running QDoc,
the \c libclang package is required.
+ \note On Windows, after installing the pre-built LLVM you must restart your
+ build shell to ensure that LLVM's binary directory is added to the PATH
+ variable. This is needed to be able to run qdoc.
+
\section1 Set Clang location automatically
The Qt build system uses the tool \c llvm-config to discover the location