diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-06 20:01:31 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-06 20:01:31 +0200 |
| commit | e87645fba5e15d29cb8b913f2a00afaba1bf5f8e (patch) | |
| tree | 00f254b5c9e4ff8e7a5243925c1e7c0e0329f974 /sources/pyside2/PySide2 | |
| parent | 3033b99b5158c12f520ac6026d26c3f77783c56d (diff) | |
| parent | e0cc8e5031453cd52a72aeb2aa69161abadeaefb (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If256dd2b05ef2e31592cf50327ec9a2d6fb742bb
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtCharts/typesystem_charts.xml | 13 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 13 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/glue/qtcore.cpp | 2 |
3 files changed, 22 insertions, 6 deletions
diff --git a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml index a14177586..967118cd9 100644 --- a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml +++ b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml @@ -75,7 +75,18 @@ <enum-type name="SeriesType"/> </object-type> <object-type name="QAreaLegendMarker" since="5.7"/> - <object-type name="QAreaSeries" since="5.7"/> + <object-type name="QAreaSeries" since="5.7"> + <modify-function signature="setUpperSeries(QtCharts::QLineSeries*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setLowerSeries(QtCharts::QLineSeries*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> <object-type name="QBarCategoryAxis" since="5.7"/> <object-type name="QBarLegendMarker" since="5.7"/> <object-type name="QBarModelMapper" since="5.7"/> diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index b418d2689..53ab29382 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -2292,7 +2292,13 @@ <enum-type name="LibraryLocation"/> </object-type> <object-type name="QMutexLocker" copyable="no"> - <modify-function signature="QMutexLocker(QBasicMutex*)"> + <!-- PYSIDE-1271: Creating locking capable objects inside sections that + contain allow-thread, require the classes to also allow having threads. + The lack of the option here, was generating a deadlock when running a + QMutexLocker inside a QThread::run. + The reason of having this change is due to the new way of handling the GIL + in the Qt calls on the whole PySide2 module, that started on 5.14.2--> + <modify-function signature="QMutexLocker(QBasicMutex*)" allow-thread="yes"> <modify-argument index="1"> <reference-count action="set" variable-name="mutex()const0"/> </modify-argument> @@ -2311,14 +2317,13 @@ <!-- Qt5 addition --> <object-type name="QBasicMutex"> - <modify-function signature="lock()"/> - <modify-function signature="tryLock()"/> + <modify-function signature="lock()" allow-thread="yes"/> + <modify-function signature="tryLock()" allow-thread="yes"/> </object-type> <object-type name="QMutex"> <enum-type name="RecursionMode"/> <modify-function signature="lock()" allow-thread="yes"/> - <modify-function signature="unlock()" allow-thread="yes"/> <modify-function signature="tryLock(int)" allow-thread="yes"/> </object-type> <object-type name="QRecursiveMutex" since="5.14"/> diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index 169b89cae..834383679 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -608,7 +608,7 @@ static void msgHandlerCallback(QtMsgType type, const QMessageLogContext &ctx, co Shiboken::AutoDecRef arglist(PyTuple_New(3)); PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QtMsgType](type)); PyTuple_SET_ITEM(arglist, 1, %CONVERTTOPYTHON[QMessageLogContext &](ctx)); - QByteArray array = msg.toLocal8Bit(); + QByteArray array = msg.toUtf8(); // Python handler requires UTF-8 char *data = array.data(); PyTuple_SET_ITEM(arglist, 2, %CONVERTTOPYTHON[char *](data)); Shiboken::AutoDecRef ret(PyObject_CallObject(qtmsghandler, arglist)); |