summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2018-08-30 15:27:56 +0200
committerPaul Wicking <paul.wicking@qt.io>2018-08-30 17:20:05 +0000
commit4d00f7c4dc3f3f54edb74a6dc00034e9e9e6ede7 (patch)
tree644e5f850ea1a2da1a66d97182979baf144645cc
parent2a3d2155c8b7dc2e1945c825354752d0c86ddb9d (diff)
Doc: Add QDoc's Clang dependency info to platform requirement pages
Add information about QDoc's Clang dependency to the requirement pages for Windows, macOS, Linux. Task-number: QTBUG-65762 Change-Id: Id2ff49459ba28b2eaffb839012a96b4497521a12 Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--doc/src/platforms/linux.qdoc5
-rw-r--r--doc/src/platforms/osx.qdoc5
-rw-r--r--doc/src/platforms/windows.qdoc8
3 files changed, 18 insertions, 0 deletions
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 9e72166b3..6827cd8e2 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -342,6 +342,11 @@
\l{Qt WebEngine} has additional build requirements which are listed in the
\l{Qt WebEngine Platform Notes}.
+
+ \section1 QDoc Dependencies
+ Since version 5.11, \l {QDoc Manual}{QDoc} uses Clang to parse C++ code.
+ If you wish to build QDoc manually, refer to \l {Installing Clang for QDoc}
+ for specific build requirements.
*/
/*!
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index c08388a65..1afb5294d 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -183,6 +183,11 @@
Qt 5 does not support OS X on PowerPC.
+ \section1 QDoc Dependencies
+ Since version 5.11, \l {QDoc Manual}{QDoc} uses Clang to parse C++ code.
+ If you wish to build QDoc manually, refer to \l {Installing Clang for QDoc}
+ for specific build requirements.
+
*/
/*!
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index de94e7263..f78df48e2 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -438,10 +438,18 @@
using the clang-cl tool to build Qt. Clang 3.8 does not support precompiled
headers.
+ \sa {QDoc Dependencies}
+
\section2 Building Qt WebEngine
\l{Qt WebEngine} has additional build requirements which are listed in the
\l{Qt WebEngine Platform Notes}.
+
+ \section1 QDoc Dependencies
+ Since version 5.11, \l {QDoc Manual}{QDoc} uses Clang to parse C++ code.
+ If you wish to build QDoc manually, refer to \l {Installing Clang for QDoc}
+ for specific build requirements.
+
*/
/*!