diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-26 17:53:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-26 17:53:49 +0200 |
| commit | 41b49a16d62f5c759e4f8053cefa10b3f0390b31 (patch) | |
| tree | e0a24fb8f1f96021220eb5fc894fccfac2247189 /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | ff94459c809e2ccd13e6d669b053667d35b3e571 (diff) | |
| parent | 52f29458d7d6cb379d28d84021819516723d9169 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I75984f35bcdeeeb3b6004a00670f1582ab522c1b
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 829e38551..bac210ba7 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1477,9 +1477,15 @@ <enum-type name="IteratorFlag" flags="IteratorFlags"/> </object-type> <object-type name="QThread"> + <inject-code file="../glue/qtcore.cpp" class="native" position="beginning" snippet="qthread_pthread_cleanup"/> <enum-type name="Priority"/> <modify-function signature="currentThreadId()" remove="all"/> - <modify-function signature="run()" allow-thread="yes"/> + <modify-function signature="run()" allow-thread="yes"> + <inject-code file="../glue/qtcore.cpp" class="native" position="beginning" + snippet="qthread_pthread_cleanup_install"/> + <inject-code file="../glue/qtcore.cpp" class="native" position="end" + snippet="qthread_pthread_cleanup_uninstall"/> + </modify-function> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> <modify-function signature="msleep(unsigned long)" allow-thread="yes"/> <modify-function signature="sleep(unsigned long)" allow-thread="yes"/> |