diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-02 13:55:04 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-02 13:18:38 +0000 |
| commit | 94dd6e146f3cc63c5b80ad7cd2ee5221b9502265 (patch) | |
| tree | 339f849e63fdd20f2fbdd6e162c523ae8bf34a29 /sources/pyside2/PySide2 | |
| parent | 9d4fd1b6526911e2836e84e45f67315968b1a117 (diff) | |
Add QTimeZone
Task-number: PYSIDE-487
Change-Id: I9a2c19c6b8415e3f608531b315a6841eb3de55f5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index 4e833f584..5e3c16a08 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -136,6 +136,8 @@ ${QtCore_GEN_DIR}/qtime_wrapper.cpp ${QtCore_GEN_DIR}/qtimeline_wrapper.cpp ${QtCore_GEN_DIR}/qtimer_wrapper.cpp ${QtCore_GEN_DIR}/qtimerevent_wrapper.cpp +${QtCore_GEN_DIR}/qtimezone_wrapper.cpp +${QtCore_GEN_DIR}/qtimezone_offsetdata_wrapper.cpp ${QtCore_GEN_DIR}/qtranslator_wrapper.cpp ${QtCore_GEN_DIR}/qurl_wrapper.cpp ${QtCore_GEN_DIR}/qvariantanimation_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index e81eb7e21..f3bf41923 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1748,6 +1748,12 @@ </modify-function> </value-type> + <value-type name="QTimeZone"> + <enum-type name="TimeType"/> + <enum-type name="NameType"/> + <value-type name="OffsetData"/> + </value-type> + <!-- FIXME QT5: Remove QUuid because cyclic dependency found on overloaddata QUuid(), this lead to cyclic dependency in <<(QDataStream &, QUUid) and incorrect QDataStream code generation (Windows only)--> <!-- <value-type name="QUuid"> |