diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-04 09:11:15 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-06 13:45:12 +0100 |
| commit | 6baf94735ff683adb4233825a8b0adbd68e9ed8a (patch) | |
| tree | 381a1d823610eecab27bfb58e5fed3ad49deb55b | |
| parent | d1604053e9ae354963a2b2447b3d196fc5dda73e (diff) | |
Add QDeadlineTimer
The class will replace timeout parameters in Qt 5.15 as
introduced by qtbase/72f57cc84244633ca69ede9a1fd510b9b1881c1d,
causing warnings like:
Stripping argument #1 of bool QThread::wait(QDeadlineTimer) due to unmatched type "QDeadlineTimer" with default expression "QDeadlineTimer(QDeadlineTimer::Forever)".
Stripping argument #2 of bool QWaitCondition::wait(QMutex*,QDeadlineTimer) due to unmatched type "QDeadlineTimer" with default expression "QDeadlineTimer(QDeadlineTimer::Forever)".
Stripping argument #2 of bool QWaitCondition::wait(QReadWriteLock*,QDeadlineTimer) due to unmatched type "QDeadlineTimer" with default expression "QDeadlineTimer(QDeadlineTimer::Forever)".
Change-Id: I51655ef19d8276b95c2a759d5ba44287a4b6d91b
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index 8e9337157..c1add5f21 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -47,6 +47,7 @@ ${QtCore_GEN_DIR}/qcryptographichash_wrapper.cpp ${QtCore_GEN_DIR}/qdatastream_wrapper.cpp ${QtCore_GEN_DIR}/qdate_wrapper.cpp ${QtCore_GEN_DIR}/qdatetime_wrapper.cpp +${QtCore_GEN_DIR}/qdeadlinetimer_wrapper.cpp ${QtCore_GEN_DIR}/qdir_wrapper.cpp ${QtCore_GEN_DIR}/qdiriterator_wrapper.cpp ${QtCore_GEN_DIR}/qdynamicpropertychangeevent_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 9b139668c..695fd670f 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -682,6 +682,10 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-installmessagehandler"/> </add-function> + <value-type name="QDeadlineTimer" since="5.8"> + <enum-type name="ForeverConstant"/> + </value-type> + <value-type name="QElapsedTimer" since="4.7"> <enum-type name="ClockType" since="4.7"/> </value-type> |