diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-07 10:39:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-07 10:39:11 +0200 |
| commit | 98a70cea3c1e996c341382834f8396794b2d67f1 (patch) | |
| tree | 0bd1cd8faad15664f195c37b1c987d85a2281a4a /sources/pyside2/doc | |
| parent | 4f4716ace2c114e1565359f5eeacd1cf19542b2d (diff) | |
| parent | 700727855c8f5337a0901536b0a65cd608b40b28 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I81270510e3a27915781a50769bb627e666970142
Diffstat (limited to 'sources/pyside2/doc')
| -rw-r--r-- | sources/pyside2/doc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in | 3 | ||||
| -rw-r--r-- | sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt index 1c2c3669e..5a78db453 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt @@ -43,6 +43,8 @@ foreach(moduleIn ${all_module_shortnames}) set(modules Qml Quick "${moduleIn}") elseif ("${moduleIn}" STREQUAL "MultimediaWidgets") set(modules Multimedia "${moduleIn}") + elseif ("${moduleIn}" STREQUAL "WebEngineWidgets") + set(modules WebEngine WebEngineCore "${moduleIn}") else() set(modules "${moduleIn}") endif() diff --git a/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in deleted file mode 100644 index 5415c392c..000000000 --- a/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in +++ /dev/null @@ -1,3 +0,0 @@ -include(@QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc/qtmultimedia.qdocconf) -includepaths += -I @QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc -include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in deleted file mode 100644 index 038c803df..000000000 --- a/sources/pyside2/doc/qtmodules/pyside-qtwebenginecore.qdocconf.in +++ /dev/null @@ -1,3 +0,0 @@ -include(@QT_SRC_DIR@/../qtwebengine/src/webengine/doc/qtwebengine.qdocconf) -includepaths += -I @QT_SRC_DIR@/../qtwebengine/src/webengine/doc -include(../pyside-config.qdocconf) |