summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2018-06-01 14:55:35 +0200
committerVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2018-06-05 05:50:28 +0000
commitd059b89abf24159205c4b7d9d59cddfd47a42a66 (patch)
tree08bc3ed62a84e9539accf502f1a169871d94426e
parenta040c633b96e9ee4ff6a15af83214369768a30ac (diff)
Doc: Include webengine module docs
Change-Id: I9ea0bed7709265c89e1bf38624024e61ee07adc7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--sources/pyside2/doc/index.rst4
-rw-r--r--sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in3
-rw-r--r--sources/pyside2/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in3
3 files changed, 10 insertions, 0 deletions
diff --git a/sources/pyside2/doc/index.rst b/sources/pyside2/doc/index.rst
index d505d575..fa1daec0 100644
--- a/sources/pyside2/doc/index.rst
+++ b/sources/pyside2/doc/index.rst
@@ -61,6 +61,10 @@ Qt Modules
- `Qt AxContainer <PySide2/QtAxContainer/index.html>`_
Provides QAxObject and QAxWidget which act as
containers for COM objects and ActiveX controls.
+ * - `Qt WebEngineCore <PySide2/QtWebEngineCore/index.html>`_
+ Provides the core functionality to integrate web content
+ - `Qt WebEngineWidgets <PySide2/QtWebEngineWidgets/index.html>`_
+ Provides widgets that can handle web content
* - `Qt WebChannel <PySide2/QtWebChannel/index.html>`_
Enables peer-to-peer communication between a server and a client
(HTML/JavaScript or QML application).
diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in
new file mode 100644
index 00000000..038c803d
--- /dev/null
+++ b/sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in
@@ -0,0 +1,3 @@
+include(@QT_SRC_DIR@/../qtwebengine/src/webengine/doc/qtwebengine.qdocconf)
+includepaths += -I @QT_SRC_DIR@/../qtwebengine/src/webengine/doc
+include(../pyside-config.qdocconf)
diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in
new file mode 100644
index 00000000..038c803d
--- /dev/null
+++ b/sources/pyside2/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in
@@ -0,0 +1,3 @@
+include(@QT_SRC_DIR@/../qtwebengine/src/webengine/doc/qtwebengine.qdocconf)
+includepaths += -I @QT_SRC_DIR@/../qtwebengine/src/webengine/doc
+include(../pyside-config.qdocconf)