diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-20 19:59:06 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-20 19:59:29 +0200 |
| commit | e8d90a9e62898d3b746772d9ae8542b87efcecf8 (patch) | |
| tree | f4ad1e6906f5a9ea805b677d6d878204b64e85e3 /sources/pyside2/PySide2/QtConcurrent | |
| parent | f1bcf7d077282f9248aee570545765ef60af00e3 (diff) | |
| parent | a14ea7738f493280f5c7b6e4a8834a7d1daacd1e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iaabea628351fac9da88b5779b537f62262ff82a7
Diffstat (limited to 'sources/pyside2/PySide2/QtConcurrent')
| -rw-r--r-- | sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt index 145a8bfc3..a6e8cd202 100644 --- a/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtConcurrent/CMakeLists.txt @@ -2,6 +2,10 @@ project(QtConcurrent) set(QtConcurrent_SRC ${QtConcurrent_GEN_DIR}/qtconcurrent_wrapper.cpp +${QtConcurrent_GEN_DIR}/qfuturevoid_wrapper.cpp +${QtConcurrent_GEN_DIR}/qfutureqstring_wrapper.cpp +${QtConcurrent_GEN_DIR}/qfuturewatchervoid_wrapper.cpp +${QtConcurrent_GEN_DIR}/qfuturewatcherqstring_wrapper.cpp # module is always needed ${QtConcurrent_GEN_DIR}/qtconcurrent_module_wrapper.cpp ) diff --git a/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml b/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml index 7e7bd9bcc..ea34150cd 100644 --- a/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml +++ b/sources/pyside2/PySide2/QtConcurrent/typesystem_concurrent.xml @@ -54,4 +54,18 @@ </extra-includes> </namespace-type> + <typedef-type name="QFutureVoid" source="QFuture<void>" disable-wrapper="yes"> + <include file-name="QtCore/qfuture.h" location="global"/> + <modify-function signature="isResultReadyAt(int) const" remove="all"/> + </typedef-type> + <typedef-type name="QFutureQString" source="QFuture<QString>" disable-wrapper="yes"> + <include file-name="QtCore/qfuture.h" location="global"/> + </typedef-type> + <typedef-type name="QFutureWatcherVoid" source="QFutureWatcher<void>"> + <include file-name="QtCore/qfuturewatcher.h" location="global"/> + </typedef-type> + <typedef-type name="QFutureWatcherQString" source="QFutureWatcher<QString>"> + <include file-name="QtCore/qfuturewatcher.h" location="global"/> + </typedef-type> + </typesystem> |