diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-22 10:58:19 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-08-22 11:10:23 +0200 |
| commit | 52c58bfc2247449c81b06e4122022355d4d1dcde (patch) | |
| tree | 46a36e351b08e4307ff1ec3308869373cc0d9e5b /sources/pyside2/PySide2/QtCore | |
| parent | 58a93d240c5bdd3bc60ccddbc31676bd0fa2eae3 (diff) | |
| parent | 8aca0dec116c6b321373f5636b34036530ac6e4b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Iddee2cf511ee0f0896a04a76e5b5b8bd44d1d6f1
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
| -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 afef603c7..0439f0a5c 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}/qurlquery_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index b8e070788..efcc5d955 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1787,6 +1787,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"> |