diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-03-02 13:05:53 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-03-08 12:00:51 +0000 |
| commit | d90885ba4885535bad6166bf1427141819e90fec (patch) | |
| tree | 922a0bea620a7f73a89bd312f7d0d5f7f8283d5a /src/webengine/doc/qtwebengine.qdocconf | |
| parent | b42bd455b2b91db4f828b14729525d97b425ab6a (diff) | |
| download | qtwebengine-d90885ba4885535bad6166bf1427141819e90fec.tar.gz | |
Doc: Fix documentation build to work with Clang-enabled QDoc
Since Qt 5.11, QDoc uses Clang to parse C++ code for documentation.
As we have a combined documentation project under src/webengine that
covers also webenginewidgets, qmake does not pass the full set
of include paths required for Clang to parse also webenginewidgets
documentation. Fix this by adding the required include paths in
qtwebengine.qdocconf, and by using a custom module header, used
for doc builds, to pull in also the QtWebEngineWidgets module
header which Clang needs.
Task-number: QTBUG-66398
Change-Id: I1da547745c0c06762be216ae55724508b5d6a700
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/webengine/doc/qtwebengine.qdocconf')
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index 7b1bad4e6..401e59f31 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -38,6 +38,13 @@ manifestmeta.highlighted.names += "QtWebEngine/WebEngine Widgets Simple Browser tagfile = ../../../doc/qtwebengine/qtwebengine.tags +# Custom module header for clang that pulls in also QtWebEngineWidgets +moduleheader = QtWebEngine_pch.h + +# Additional include paths for clang +includepaths = -I $QT_PLUGIN_PATH/../include/QtWidgets \ + -I $QT_PLUGIN_PATH/../include/QtWebEngineWidgets + depends += qtcore \ qtgui \ qtlocation \ |