diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-03 14:14:00 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-05 01:38:14 +0200 |
| commit | 3dcef048966bf0783cec66bf7e63307a1182cadf (patch) | |
| tree | 47955878593acd80935a4a15c1f58f9f3a2aa00f /sources/pyside2/PySide2 | |
| parent | 155a2608309f44757bfa6433a44129e306cd5cce (diff) | |
Add Qt Core bindings for Qt 5.14
Adding the new QCalendar class is required to unlock the branch since
the rejected constructor QDate(int, int, int, QCalendar) causes test
failures in of QDate.
Task-number: PYSIDE-487
Change-Id: I2720b92f3356421065f539ea0eba75d3049b9702
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index c385803a7..8e9337157 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -186,6 +186,13 @@ if (Qt5Core_VERSION VERSION_EQUAL 5.13.0 OR Qt5Core_VERSION VERSION_GREATER 5.13 ${QtCore_GEN_DIR}/qtransposeproxymodel_wrapper.cpp) endif() +if (Qt5Core_VERSION VERSION_EQUAL 5.14.0 OR Qt5Core_VERSION VERSION_GREATER 5.14.0) + list(APPEND QtCore_SRC + ${QtCore_GEN_DIR}/qcalendar_wrapper.cpp + ${QtCore_GEN_DIR}/qcalendar_yearmonthday_wrapper.cpp + ${QtCore_GEN_DIR}/qrecursivemutex_wrapper.cpp) +endif() + set(QtCore_glue_sources "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.cpp" "${QtCore_SOURCE_DIR}/glue/qeasingcurve_glue.h" diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index eb4e502ea..085cd6b10 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -599,6 +599,7 @@ <enum-type name="GestureState" since="4.6"/> <enum-type name="GestureType" since="4.6"/> <enum-type name="GlobalColor"/> + <enum-type name="HighDpiScaleFactorRoundingPolicy" since="5.14"/> <enum-type name="HitTestAccuracy"/> <enum-type name="ImageConversionFlag" flags="ImageConversionFlags"/> <enum-type name="InputMethodHint" flags="InputMethodHints" since="4.6"/> @@ -630,6 +631,7 @@ <enum-type name="SizeHint"/> <enum-type name="SizeMode"/> <enum-type name="SortOrder"/> + <enum-type name="SplitBehaviorFlags" flags="SplitBehavior" since="5.14"/> <enum-type name="TabFocusBehavior" since="5.5"/> <enum-type name="TextElideMode"/> <enum-type name="TextFlag"/> @@ -785,6 +787,10 @@ <value-type name="QBasicTimer"/> <value-type name="QByteArrayMatcher"/> + <value-type name="QCalendar" since="5.14"> + <value-type name="YearMonthDay"/> + <enum-type name="System"/> + </value-type> <value-type name="QDate" hash-function="PySide::hash" > <inject-code class="native" position="beginning"> <insert-template name="pydatetime_importandcheck_function"> @@ -847,6 +853,7 @@ </modify-function> </value-type> <value-type name="QDateTime" hash-function="PySide::hash"> + <enum-type name="YearRange" since="5.14"/> <inject-code class="native" position="beginning"> <insert-template name="pydatetime_importandcheck_function"> <replace from="$DATETIMETYPE" to="PyDateTime"/> @@ -2296,6 +2303,7 @@ <modify-function signature="lock()" allow-thread="yes"/> <modify-function signature="tryLock(int)" allow-thread="yes"/> </object-type> + <object-type name="QRecursiveMutex" since="5.14"/> <object-type name="QRandomGenerator" since="5.10"> <modify-function signature="global()" rename="global_" allow-thread="yes"/> <modify-function signature="operator()()" remove="all"/> @@ -2828,9 +2836,7 @@ <include file-name="qobjectdefs.h" location="global"/> </value-type> - <object-type name="QMessageLogContext"> - <modify-function signature="copy(const QMessageLogContext &)" remove="all"/> - </object-type> + <object-type name="QMessageLogContext"/> <value-type name="QMetaMethod"> <enum-type name="Access"/> |