diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-09 11:30:08 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-09 11:30:10 +0200 |
| commit | 352a80482b0afdc1df5acf526e4ada2c0d30b806 (patch) | |
| tree | f2286a8a81a3e573e7123fa1a6a56d61fdb91726 /PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml | |
| parent | 08676d1464e828a52d6e90273c7aac6549c35274 (diff) | |
| parent | 25bc996071c4878ebcec18e695c1c681aefd74bc (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I5d7b278fab717c99a74d990d5b426120ee9c0c06
Diffstat (limited to 'PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml')
| -rw-r--r-- | PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml b/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml index 7de4c73dc..76214baef 100644 --- a/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml +++ b/PySide2/QtMultimediaWidgets/typesystem_multimediawidgets.xml @@ -42,7 +42,7 @@ <typesystem package="PySide2.QtMultimediaWidgets"> <load-typesystem name="typesystem_core.xml" generate="no" /> <load-typesystem name="typesystem_gui.xml" generate="no" /> - <load-typesystem name="typesystem_multimedia.xml" generate="no" /> + <load-typesystem name="typesystem_multimedia_common.xml" generate="no" /> <load-typesystem name="typesystem_widgets.xml" generate="no" /> <object-type name="QCameraViewfinder"/> |