From d90885ba4885535bad6166bf1427141819e90fec Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 2 Mar 2018 13:05:53 +0100 Subject: Doc: Fix documentation build to work with Clang-enabled QDoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Kai Koehne --- src/webengine/doc/qtwebengine.qdocconf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/webengine/doc/qtwebengine.qdocconf') 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 \ -- cgit v1.2.1