diff options
Diffstat (limited to 'sources/pyside2')
4 files changed, 34 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> diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index b6a374073..31c1db0ee 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -63,6 +63,7 @@ ${QtCore_GEN_DIR}/qfiledevice_wrapper.cpp ${QtCore_GEN_DIR}/qfileinfo_wrapper.cpp ${QtCore_GEN_DIR}/qfileselector_wrapper.cpp ${QtCore_GEN_DIR}/qfilesystemwatcher_wrapper.cpp +${QtCore_GEN_DIR}/qfutureinterfacebase_wrapper.cpp ${QtCore_GEN_DIR}/qgenericargument_wrapper.cpp ${QtCore_GEN_DIR}/qgenericreturnargument_wrapper.cpp ${QtCore_GEN_DIR}/qidentityproxymodel_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index daa636f98..d20949a10 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -2714,6 +2714,21 @@ </modify-function> </value-type> + <object-type name="QFutureInterfaceBase"> + <enum-type name="State"/> + </object-type> + <value-type name="QFuture" generate="no"> + <include file-name="QtCore/qfuture.h" location="global"/> + <modify-function signature="waitForFinished()" allow-thread="yes"/> + </value-type> + <object-type name="QFutureWatcherBase" generate="no"> + <modify-function signature="futureInterface()" remove="all"/> + <modify-function signature="futureInterface() const" remove="all"/> + </object-type> + <object-type name="QFutureWatcher" generate="no"> + <include file-name="QtCore/qfuturewatcher.h" location="global"/> + </object-type> + <value-type name="QGenericArgument"> <include file-name="qobjectdefs.h" location="global"/> </value-type> |