diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-03-27 12:07:58 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-03-27 11:36:52 +0000 |
| commit | 69c9f404b8411dc1808ba2799dacd7756d196e83 (patch) | |
| tree | 6a6ef3bd4f682d84a8c03eefd62b94a3896b6b07 /src/webengine/doc | |
| parent | fe8be45b37c9c04db3787f1d3e2d481a3b8d65fd (diff) | |
Doc: Drop the use of QT_PLUGIN_PATH in documentation config
This caused build issues in certain configurations. We don't actually
need it, as we can rely on the base Qt include path instead.
Also move the custom module header under src/webengine/doc and rename
it.
Task-number: QTBUG-67342
Change-Id: Id5e809202ddaa285bfcc341a36b0b3d5a7ade436
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/webengine/doc')
| -rw-r--r-- | src/webengine/doc/QtWebEngineDoc | 2 | ||||
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/webengine/doc/QtWebEngineDoc b/src/webengine/doc/QtWebEngineDoc new file mode 100644 index 000000000..0737885f1 --- /dev/null +++ b/src/webengine/doc/QtWebEngineDoc @@ -0,0 +1,2 @@ +#include <QtWebEngine/QtWebEngine> +#include <QtWebEngineWidgets/QtWebEngineWidgets> diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index 401e59f31..dc162bf56 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -39,11 +39,10 @@ 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 +moduleheader = QtWebEngineDoc # Additional include paths for clang -includepaths = -I $QT_PLUGIN_PATH/../include/QtWidgets \ - -I $QT_PLUGIN_PATH/../include/QtWebEngineWidgets +includepaths = -I . depends += qtcore \ qtgui \ |