diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:41:11 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:51:45 +0200 |
commit | d850748283698596327653ec30decdbd6c964af8 (patch) | |
tree | 6efc71e7877294fb616f88f1f17f089d4dce1b84 /sources/pyside2/doc/qtmodules | |
parent | 46ff21ee14e00b992b49562943274d62f2b5b456 (diff) | |
parent | ffae5fe2f3312fdad7ef5880308dae4fd31fec94 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib2eeca97ebabcff53ef7ddd9fc769be6424db39f
Diffstat (limited to 'sources/pyside2/doc/qtmodules')
-rw-r--r-- | sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in | 3 | ||||
-rw-r--r-- | sources/pyside2/doc/qtmodules/pyside-qtwebenginewidgets.qdocconf.in | 3 |
2 files changed, 6 insertions, 0 deletions
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 000000000..038c803df --- /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 000000000..038c803df --- /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) |