diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp | 7 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 24 |
3 files changed, 22 insertions, 16 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/glue/qeasingcurve_glue.cpp b/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp index 6629d3c91..552191955 100644 --- a/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp +++ b/sources/pyside2/PySide2/QtCore/glue/qeasingcurve_glue.cpp @@ -44,7 +44,6 @@ #include "glue/qeasingcurve_glue.h" -#define __ECF_ATT_NAME__ "__ecf__" #define MAX_CUSTOM_FUNCTIONS 10 static void deleteData(void *data); @@ -122,7 +121,7 @@ PySideEasingCurveFunctor::~PySideEasingCurveFunctor() { CustomFunctionsData::m_list[m_index].m_obj = 0; - PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, Py_None); + PyObject_SetAttr(m_parent, Shiboken::PyMagicName::ecf(), Py_None); } qreal PySideEasingCurveFunctor::operator()(qreal progress) @@ -147,13 +146,13 @@ PyObject *PySideEasingCurveFunctor::callable() PyObject *PySideEasingCurveFunctor::callable(PyObject *parent) { - return PyObject_GetAttrString(parent, __ECF_ATT_NAME__); + return PyObject_GetAttr(parent, Shiboken::PyMagicName::ecf()); } PySideEasingCurveFunctor::PySideEasingCurveFunctor(int index, PyObject *parent, PyObject *pyFunc) : m_parent(parent), m_func(pyFunc), m_index(index) { - PyObject_SetAttrString(m_parent, __ECF_ATT_NAME__, m_func); + PyObject_SetAttr(m_parent, Shiboken::PyMagicName::ecf(), m_func); PySide::WeakRef::create(m_parent, deleteData, this); } diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index eb4e502ea..470e253b1 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"/> @@ -2546,12 +2554,6 @@ <include file-name="QtCore/QtCore" location="global"/> </extra-includes> - <modify-function signature="setDevice(QIODevice*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <!-- ### Replaced by write<TYPE> methods --> <modify-function signature="operator>>(qint8&)" remove="all"/> <modify-function signature="operator>>(bool&)" remove="all"/> @@ -2828,9 +2830,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"/> @@ -2844,9 +2844,9 @@ <include file-name="qobjectdefs.h" location="global"/> <!-- This isn't part of Qt public API --> <modify-function signature="connect(const QObject*,int,const QObject*,int,int,int*)" remove="all"/> - </object-type> - <object-type name="QMetaObject::Connection"> - <include file-name="qobjectdefs.h" location="global"/> + <object-type name="Connection"> + <include file-name="qobjectdefs.h" location="global"/> + </object-type> </object-type> <value-type name="QMetaProperty" > <!-- This isn't part of Qt public API --> |