diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-16 09:43:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-20 13:30:48 +0200 |
| commit | eebebfa665ab4bae01819378f3842bf9384fa7f7 (patch) | |
| tree | fb568f56830809d20aa8bd4e5f481487fa6bee6e | |
| parent | 125d3edcee32ae3f7c92d2a9a10b6ecee769de74 (diff) | |
PySide6: Fix QtWebEngine documentation
Adapt the paths to the new modules and add TOC entries.
Change-Id: Icf5249650db18b113e35d1596c853221348eca20
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside6/doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside6/doc/modules.rst | 7 | ||||
| -rw-r--r-- | sources/pyside6/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/sources/pyside6/doc/CMakeLists.txt b/sources/pyside6/doc/CMakeLists.txt index 1f10b9375..f900b96eb 100644 --- a/sources/pyside6/doc/CMakeLists.txt +++ b/sources/pyside6/doc/CMakeLists.txt @@ -92,7 +92,7 @@ if (FULLDOCSBUILD) elseif ("${moduleIn}" STREQUAL "Svg") set(modules "${moduleIn}" SvgWidgets) elseif ("${moduleIn}" STREQUAL "WebEngineWidgets") - set(modules WebEngine WebEngineCore "${moduleIn}") + set(modules WebEngineCore WebEngineWidgets WebEngineQuick "${moduleIn}") set(HAS_WEBENGINE_WIDGETS 1) else() set(modules "${moduleIn}") diff --git a/sources/pyside6/doc/modules.rst b/sources/pyside6/doc/modules.rst index 0c7b9fe6a..31937f291 100644 --- a/sources/pyside6/doc/modules.rst +++ b/sources/pyside6/doc/modules.rst @@ -65,6 +65,13 @@ Qt Modules Provides a C++ implementation of DOM. - :mod:`Qt 3D Animation <PySide6.Qt3DAnimation>` Provides basic elements required to animate 3D objects. + * - :mod:`Qt WebEngine Core C++ Classes <PySide6.QtWebEngineCore>` + Provides public API shared by both QtWebEngine and QtWebEngineWidgets. + - :mod:`Qt WebEngine Widgets C++ Classes <PySide6.QtWebEngineWidgets>` + Provides C++ classes for rendering web content in a QWidget based application. + * - :mod:`Qt WebEngine QML Types <PySide6.QtWebEngineQuick>` + Provides QML types for rendering web content within a QML application. + - * - :mod:`Qt 3D Core <PySide6.Qt3DCore>` Contains functionality to support near-realtime simulation systems. - :mod:`Qt 3D Extras <PySide6.Qt3DExtras>` diff --git a/sources/pyside6/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in b/sources/pyside6/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in index 038c803df..90c8d1b1f 100644 --- a/sources/pyside6/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in +++ b/sources/pyside6/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in @@ -1,3 +1,3 @@ -include(@QT_SRC_DIR@/../qtwebengine/src/webengine/doc/qtwebengine.qdocconf) -includepaths += -I @QT_SRC_DIR@/../qtwebengine/src/webengine/doc +include(@QT_SRC_DIR@/../qtwebengine/src/core/doc/qtwebengine.qdocconf) +includepaths += -I @QT_SRC_DIR@/../qtwebengine/src/core/doc include(../pyside-config.qdocconf) |