diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 09:30:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-15 10:04:34 +0200 |
| commit | 3a1cf48137752ef3640ae7b1e2937e4bed34d3b2 (patch) | |
| tree | af82a85bd7f4d5c26d40c6ed4079190481389e6f /sources | |
| parent | 91cc9fc5f95de0d800dd4da46fc3fbe262258390 (diff) | |
Fix crashes in QThread::wait(), QWaitCondition::wait()
Add allow-thread for the newly added overloads in 5.15
Fixes: PYSIDE-1332
Change-Id: I1e463203ea9914ae71991262745d803fc9001b7d
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 0cdd5e2f7..be5b0cf03 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1467,6 +1467,7 @@ <modify-function signature="msleep(unsigned long)" allow-thread="yes"/> <modify-function signature="sleep(unsigned long)" allow-thread="yes"/> <modify-function signature="usleep(unsigned long)" allow-thread="yes"/> + <modify-function signature="wait(QDeadlineTimer)" allow-thread="yes"/> <modify-function signature="wait(unsigned long)" allow-thread="yes"/> <modify-function signature="yieldCurrentThread()" allow-thread="yes"/> <modify-function signature="start(QThread::Priority)" allow-thread="yes"> @@ -2420,7 +2421,9 @@ </modify-function> </object-type> <object-type name="QWaitCondition"> + <modify-function signature="wait(QMutex*,QDeadlineTimer)" allow-thread="yes"/> <modify-function signature="wait(QMutex*,unsigned long)" allow-thread="yes"/> + <modify-function signature="wait(QReadWriteLock*,QDeadlineTimer)" allow-thread="yes"/> <modify-function signature="wait(QReadWriteLock*,unsigned long)" allow-thread="yes"/> </object-type> <object-type name="QFileSystemWatcher"> |