diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-04 08:06:26 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-04 08:06:30 +0200 |
| commit | 567a7196fdb37312a90e07c05b46e1e5e5bcc1c2 (patch) | |
| tree | bc785eca5697d7b32415cf8f030adf7c37652a27 /sources/pyside2 | |
| parent | fafd06df5f87f13df7136cc903f4d7e094510325 (diff) | |
| parent | 3d34fd298735ba352d0b6e48a7778f8820a9ddc2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie8025300580981c5349b31d4846a7f659481991d
Diffstat (limited to 'sources/pyside2')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 2 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml | 11 | ||||
| -rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 309cce420..1744a5927 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -4312,6 +4312,7 @@ s1.addTransition(button.clicked, s1h)</code> </add-function> <inject-code class="native" position="beginning"> + QT_BEGIN_NAMESPACE extern bool qRegisterResourceData(int, const unsigned char *, @@ -4323,6 +4324,7 @@ s1.addTransition(button.clicked, s1h)</code> const unsigned char *, const unsigned char *, const unsigned char *); + QT_END_NAMESPACE </inject-code> <add-function signature="qRegisterResourceData(int,PyBytes,PyBytes,PyBytes)" return-type="bool"> <inject-code class="target" position="beginning"> diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index 5486fb157..6fe90ccb9 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -302,6 +302,17 @@ %END_ALLOW_THREADS </inject-code> </modify-function> + <modify-function signature="setVideoOutput(QAbstractVideoSurface*)"> + <modify-argument index="1"> + <replace-type modified-type="QObject *" /> + </modify-argument> + <inject-code class="target" position="beginning"> + %BEGIN_ALLOW_THREADS + QObject* upcastedArg = %CONVERTTOCPP[QObject*](%PYARG_1); + %CPPSELF.%FUNCTION_NAME(reinterpret_cast< %ARG1_TYPE >(upcastedArg)); + %END_ALLOW_THREADS + </inject-code> + </modify-function> </object-type> <object-type name="QMediaPlayerControl"/> <object-type name="QMediaPlaylist"> diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index b70743cee..367a1adc2 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -72,8 +72,10 @@ static QStack<PySide::CleanupFunction> cleanupFunctionList; static void* qobjectNextAddr; +QT_BEGIN_NAMESPACE extern bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); +QT_END_NAMESPACE namespace PySide { |