diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-01 11:13:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-08 08:57:46 +0200 |
| commit | c43661d01bad15a39c361cf054d0af093d5c0f81 (patch) | |
| tree | 70952cd5a7d1624bd82adabdbbe35dcea01de8f8 /src | |
| parent | 78559d3b0b75270f2719ef312d2583b80f8d9325 (diff) | |
Add WebEngine qdocconf for documentation
Probably still needs internal naming updates.
Task-number: QTBUG-94130
Change-Id: I3f2522b16a78475d42f9f689cf2d2e994130cf7b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/api/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core/doc/QtWebEngineDoc | 3 | ||||
| -rw-r--r-- | src/core/doc/qtwebengine.qdocconf (renamed from src/webenginequick/doc/qtwebengine.qdocconf) | 18 | ||||
| -rw-r--r-- | src/webenginequick/doc/QtWebEngineDoc | 2 |
4 files changed, 16 insertions, 11 deletions
diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt index 660473600..6d9e614d2 100644 --- a/src/core/api/CMakeLists.txt +++ b/src/core/api/CMakeLists.txt @@ -74,3 +74,7 @@ qt_internal_extend_target(WebEngineCore CONDITION QT_FEATURE_webengine_geolocati PUBLIC_LIBRARIES Qt::Positioning ) + +qt_internal_add_docs(WebEngineCore + ../doc/qtwebengine.qdocconf +) diff --git a/src/core/doc/QtWebEngineDoc b/src/core/doc/QtWebEngineDoc new file mode 100644 index 000000000..7ab3164fd --- /dev/null +++ b/src/core/doc/QtWebEngineDoc @@ -0,0 +1,3 @@ +#include <QtWebEngineCore/QtWebEngineCore> +#include <QtWebEngineQuick/QtWebEngineQuick> +#include <QtWebEngineWidgets/QtWebEngineWidgets> diff --git a/src/webenginequick/doc/qtwebengine.qdocconf b/src/core/doc/qtwebengine.qdocconf index be5db9c19..416f06abb 100644 --- a/src/webenginequick/doc/qtwebengine.qdocconf +++ b/src/core/doc/qtwebengine.qdocconf @@ -43,7 +43,7 @@ tagfile = ../../../doc/qtwebengine/qtwebengine.tags moduleheader = QtWebEngineDoc # Additional include paths for clang -includepaths = -I . +includepaths += -I . depends += qtcore \ qtgui \ @@ -60,20 +60,20 @@ depends += qtcore \ qtwebview \ qtwidgets -headerdirs += .. \ - ../../core/api \ +headerdirs += ../../core/api \ + ../../webenginequick/api \ ../../webenginewidgets/api -sourcedirs += .. \ - ../../core/api \ - ../../core/doc \ +sourcedirs = ../../core/api \ + ../../core/doc \ + ../../webenginequick/api \ + ../../webenginequick/doc \ ../../webenginewidgets/api \ ../../webenginewidgets/doc -exampledirs += . \ - ../../../examples \ - snippets \ +exampledirs += ../../../examples \ ../../core/doc/snippets \ + ../../webenginequick/doc/snippets \ ../../webenginewidgets/doc/snippets examples.fileextensions += *.aff *.dic *.html diff --git a/src/webenginequick/doc/QtWebEngineDoc b/src/webenginequick/doc/QtWebEngineDoc deleted file mode 100644 index 0737885f1..000000000 --- a/src/webenginequick/doc/QtWebEngineDoc +++ /dev/null @@ -1,2 +0,0 @@ -#include <QtWebEngine/QtWebEngine> -#include <QtWebEngineWidgets/QtWebEngineWidgets> |