diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-08-20 14:33:07 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-09-05 10:22:15 +0000 |
| commit | 3fd89cd65e7e45b3661bc58bfe93a1220aba97d3 (patch) | |
| tree | 99120c776c8e532c6f936ac4599388179a24e1d5 | |
| parent | 3d34fd298735ba352d0b6e48a7778f8820a9ddc2 (diff) | |
Doc: Remove redundant .qdocconf files from the build
QtMultimedia, QtWebEngine modules are handled with a single
.qdocconf file in Qt 5. There's no need to feed them twice to
QDoc.
This removes most '(qdoc): Output file already exists' warnings.
Change-Id: If250c9c56f7ca54c27440badd66d9ddba704f26d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| -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) |