summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-05-28 15:23:51 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-05-28 14:40:53 +0000
commit09fa2b541abb3237838929dd9e975c0a977fd338 (patch)
tree0cd73a5e97631a7fea097fc576bc09a4215eed7b
parente0a8f2dfb759ef4eff542d0a317a9370d4eddc52 (diff)
Documentation: Add QtMultimediaWidgets
They share the qdoc.conf file with QtMultimedia, which needs to be special-cased, similar to QQuickWidgets. Task-number: PYSIDE-363 Change-Id: I5abade0a715ff3245be2322eae42e7c93f643fc9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--sources/pyside2/doc/CMakeLists.txt2
-rw-r--r--sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in3
2 files changed, 5 insertions, 0 deletions
diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt
index 3105d7a0..eb9a8ad1 100644
--- a/sources/pyside2/doc/CMakeLists.txt
+++ b/sources/pyside2/doc/CMakeLists.txt
@@ -41,6 +41,8 @@ foreach(moduleIn ${all_module_shortnames})
set(modules 3DCore 3DRender 3DInput 3DLogic 3DAnimation "${moduleIn}")
elseif ("${moduleIn}" STREQUAL "QuickWidgets")
set(modules Qml Quick "${moduleIn}")
+ elseif ("${moduleIn}" STREQUAL "MultimediaWidgets")
+ set(modules Multimedia "${moduleIn}")
else()
set(modules "${moduleIn}")
endif()
diff --git a/sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in
new file mode 100644
index 00000000..5415c392
--- /dev/null
+++ b/sources/pyside2/doc/qtmodules/pyside-qtmultimediawidgets.qdocconf.in
@@ -0,0 +1,3 @@
+include(@QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc/qtmultimedia.qdocconf)
+includepaths += -I @QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc
+include(../pyside-config.qdocconf)