diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-21 11:18:38 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-24 09:36:27 +0000 |
| commit | e212817ebacab0ead54dcb76f83ac59cda8295df (patch) | |
| tree | 725bdfd90ba6f7fe32201d8ddb64c52508878276 /PySide2/QtMultimedia | |
| parent | adeecf5706215dc3a150a281af3a9bf2ac28e1da (diff) | |
Add QtMultimediaWidgets
Add module and a simple test that shows the widgets.
Task-number: PYSIDE-349
Change-Id: I0abecaa7dad03fbb1910ac049a5aed250ed80d78
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'PySide2/QtMultimedia')
| -rw-r--r-- | PySide2/QtMultimedia/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | PySide2/QtMultimedia/typesystem_multimedia.xml | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/PySide2/QtMultimedia/CMakeLists.txt b/PySide2/QtMultimedia/CMakeLists.txt index 5bbb00f2d..51b5a0424 100644 --- a/PySide2/QtMultimedia/CMakeLists.txt +++ b/PySide2/QtMultimedia/CMakeLists.txt @@ -13,6 +13,10 @@ ${QtMultimedia_GEN_DIR}/qaudioformat_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp +${QtMultimedia_GEN_DIR}/qmediabindableinterface_wrapper.cpp +${QtMultimedia_GEN_DIR}/qmediacontrol_wrapper.cpp +${QtMultimedia_GEN_DIR}/qmediaobject_wrapper.cpp + # module is always needed ${QtMultimedia_GEN_DIR}/qtmultimedia_module_wrapper.cpp ) diff --git a/PySide2/QtMultimedia/typesystem_multimedia.xml b/PySide2/QtMultimedia/typesystem_multimedia.xml index e14c0b97e..faf52961d 100644 --- a/PySide2/QtMultimedia/typesystem_multimedia.xml +++ b/PySide2/QtMultimedia/typesystem_multimedia.xml @@ -146,4 +146,9 @@ </modify-function> </object-type> + <!-- For QtMultimediaWidgets --> + <object-type name="QMediaBindableInterface"/> + <object-type name="QMediaControl"/> + <object-type name="QMediaObject"/> + </typesystem> |