diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-31 12:01:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-01 09:47:42 +0000 |
| commit | ce5ce60ba2b1412761e4e5015538513a9f69295c (patch) | |
| tree | dc456fd0a8fbf67e81dcebe36d7f407165c2c1e5 | |
| parent | 784d8b3284be6ab615e627143d21921a33013f10 (diff) | |
Signature Module: Remove special handling of QtMultimedia
QtMultimedia imported QtMultimediaWidgets apparently due to the forward
declaration of QGraphicsVideoItem and QVideoWidget in Qt 5.
This has been removed in Qt 6. qint64 is also declared in QtCore.
Change-Id: I9721d0580e63135152365e690bc20d76ca0e63bd
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 4a3d5f9affd0ba8f6d37ad5c0cdf8d2aa52914a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py index c069d644a..801027770 100644 --- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py +++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py @@ -627,22 +627,6 @@ def init_PySide6_QtNetwork(): return locals() -def init_PySide6_QtMultimedia(): - # PYSIDE-1599: We force pyi testing in wheel_tester. This seems to fail, sometimes. - try: - import PySide6.QtMultimediaWidgets - check_module(PySide6.QtMultimediaWidgets) - except SystemError: - print("Failure importing QtMultimediaWidgets") - return locals() - type_map.update({ - "QGraphicsVideoItem": PySide6.QtMultimediaWidgets.QGraphicsVideoItem, - "qint64": int, - "QVideoWidget": PySide6.QtMultimediaWidgets.QVideoWidget, - }) - return locals() - - def init_PySide6_QtOpenGL(): type_map.update({ "GLbitfield": int, |