diff options
Diffstat (limited to 'sources/pyside2/PySide2')
22 files changed, 182 insertions, 35 deletions
diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index d666751ea..e39db75a1 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -37,6 +37,10 @@ endif() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/support/__init__.py" COPYONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/generate_pyi.py" + "${CMAKE_CURRENT_BINARY_DIR}/support/generate_pyi.py" COPYONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/deprecated.py" + "${CMAKE_CURRENT_BINARY_DIR}/support/deprecated.py" COPYONLY) # now compile all modules. file(READ "${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h" pyside2_global_contents) diff --git a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml index b7369f4a1..7d64fba55 100644 --- a/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml +++ b/sources/pyside2/PySide2/Qt3DCore/typesystem_3dcore.xml @@ -48,6 +48,7 @@ <object-type name="QAbstractSkeleton" since="5.10"/> <object-type name="QArmature" since="5.10"/> <object-type name="QAspectEngine"> + <enum-type name="RunMode" since="5.14"/> <modify-function signature="registerAspect(Qt3DCore::QAbstractAspect*)"> <modify-argument index="this"> <parent index="1" action="add"/> diff --git a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml index a74c3ab93..1c7e1109b 100644 --- a/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml +++ b/sources/pyside2/PySide2/Qt3DInput/typesystem_3dinput.xml @@ -73,11 +73,11 @@ </object-type> <object-type name="QMouseEvent"> <enum-type name="Buttons"/> - <enum-type name="Modifiers"/> + <enum-type name="Modifier" flags="Modifiers" since="5.14"/> </object-type> <object-type name="QWheelEvent"> <enum-type name="Buttons"/> - <enum-type name="Modifiers"/> + <enum-type name="Modifier" flags="Modifiers" since="5.14"/> </object-type> <object-type name="QMouseHandler"/> <!-- On windows this raise the following error: diff --git a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt index 73c0c5ba6..edd023840 100644 --- a/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt +++ b/sources/pyside2/PySide2/Qt3DRender/CMakeLists.txt @@ -132,6 +132,12 @@ if (Qt53DRender_VERSION VERSION_EQUAL 5.13.0 OR Qt53DRender_VERSION VERSION_GREA ${Qt3DRender_GEN_DIR}/qt3drender_qwaitfence_wrapper.cpp) endif() +if (Qt53DRender_VERSION VERSION_EQUAL 5.14.0 OR Qt53DRender_VERSION VERSION_GREATER 5.14.0) + list(APPEND Qt3DRender_SRC + ${Qt3DRender_GEN_DIR}/qt3drender_qnopicking_wrapper.cpp + ${Qt3DRender_GEN_DIR}/qt3drender_qshaderimage_wrapper.cpp) +endif() + set(Qt3DRender_include_dirs ${Qt3DRender_SOURCE_DIR} ${Qt3DRender_BINARY_DIR} diff --git a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml index be06a3135..477dc605d 100644 --- a/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml +++ b/sources/pyside2/PySide2/Qt3DRender/typesystem_3drender.xml @@ -155,6 +155,7 @@ <object-type name="QMultiSampleAntiAliasing"/> <object-type name="QNoDepthMask"/> <object-type name="QNoDraw"/> + <object-type name="QNoPicking" since="5.14"/> <object-type name="QObjectPicker"/> <object-type name="QPaintedTextureImage"/> <object-type name="QParameter"/> @@ -213,6 +214,10 @@ <enum-type name="ShaderType"/> <enum-type name="Status"/> </object-type> + <object-type name="QShaderImage" since="5.14"> + <enum-type name="Access"/> + <enum-type name="ImageFormat"/> + </object-type> <object-type name="QShaderProgramBuilder" since="5.10"/> <object-type name="QSharedGLTexture" since="5.13"/> <object-type name="QSortPolicy"> 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 92a4f41c4..d3ca86b17 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,11 +2303,14 @@ <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"/> + <modify-function signature="generate(quint32*,quint32*)" remove="all"/> </object-type> <object-type name="QRandomGenerator64" since="5.10"> + <modify-function signature="global()" rename="global_" allow-thread="yes"/> <modify-function signature="operator()()" remove="all"/> </object-type> <object-type name="QSemaphore"> @@ -2820,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"/> diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index 18d80f647..9e6bd099f 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -210,6 +210,10 @@ ${QtGui_GEN_DIR}/qwindowstatechangeevent_wrapper.cpp ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp ) +if (Qt5Gui_VERSION VERSION_EQUAL 5.14.0 OR Qt5Gui_VERSION VERSION_GREATER 5.14.0) + list(APPEND QtGui_SRC ${QtGui_GEN_DIR}/qcolorspace_wrapper.cpp) +endif() + # cf qtbase/src/gui/opengl/opengl.pri list(FIND QtGui_enabled_features "opengles2" _opengles2Index) # ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtGui_enabled_features) diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index efb68a310..b1090b651 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -480,6 +480,7 @@ </value-type> <value-type name="QTextBlockFormat"> <enum-type name="LineHeightTypes" since="4.8" revision="4800"/> + <enum-type name="MarkerType" since="5.14"/> </value-type> <value-type name="QTextTableCellFormat"/> <value-type name="QTextCharFormat" > @@ -1094,6 +1095,13 @@ </inject-code> </modify-function> </value-type> + + <value-type name="QColorSpace" since="5.14"> + <enum-type name="NamedColorSpace"/> + <enum-type name="Primaries"/> + <enum-type name="TransferFunction"/> + </value-type> + <value-type name="QFontMetricsF" > <modify-function signature="boundingRect(QChar)const" rename="boundingRectChar"> @@ -1117,6 +1125,7 @@ <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> <modify-argument index="5"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetricsf-boundingrect"/> </modify-function> @@ -1124,6 +1133,7 @@ <modify-function signature="size(int,QString,int,int*)const"> <modify-argument index="4"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetricsf-size"/> </modify-function> @@ -1150,7 +1160,8 @@ <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> <modify-argument index="8"> - <replace-type modified-type="PyObject"/> + <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetrics-boundingrect-1"/> </modify-function> @@ -1158,6 +1169,7 @@ <modify-function signature="boundingRect(QRect,int,QString,int,int*)const"> <modify-argument index="5"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetrics-boundingrect-2"/> </modify-function> @@ -1165,6 +1177,7 @@ <modify-function signature="size(int,QString,int,int*)const"> <modify-argument index="4"> <replace-type modified-type="PyObject"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qfontmetrics-size"/> </modify-function> @@ -1744,6 +1757,7 @@ <include file-name="QTextCursor" location="global"/> </extra-includes> <enum-type name="FindFlag" flags="FindFlags"/> + <enum-type name="MarkdownFeature" flags="MarkdownFeatures" since="5.14"/> <enum-type name="MetaInformation"/> <enum-type name="ResourceType"/> <enum-type name="Stacks" since="4.7"/> @@ -1935,6 +1949,7 @@ <value-type name="QMatrix2x2" since="4.6"> <modify-function signature="QMatrix2x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -1971,6 +1986,7 @@ <value-type name="QMatrix2x3" since="4.6"> <modify-function signature="QMatrix2x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2007,6 +2023,7 @@ <value-type name="QMatrix2x4" since="4.6"> <modify-function signature="QMatrix2x4(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2043,6 +2060,7 @@ <value-type name="QMatrix3x2" since="4.6"> <modify-function signature="QMatrix3x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2079,6 +2097,7 @@ <value-type name="QMatrix3x3" since="4.6"> <modify-function signature="QMatrix3x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2115,6 +2134,7 @@ <value-type name="QMatrix3x4" since="4.6"> <modify-function signature="QMatrix3x4(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2151,6 +2171,7 @@ <value-type name="QMatrix4x2" since="4.6"> <modify-function signature="QMatrix4x2(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2187,6 +2208,7 @@ <value-type name="QMatrix4x3" since="4.6"> <modify-function signature="QMatrix4x3(const float*)" remove="all"/> <modify-function signature="copyDataTo(float*) const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -2267,6 +2289,7 @@ <modify-function signature="QMatrix4x4(const float*)"> <modify-argument index="1"> <replace-type modified-type="PySequence"/> + <array/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qmatrix4x4"/> </modify-function> @@ -2734,7 +2757,7 @@ <modify-argument index="3"><array/></modify-argument> </modify-function> <modify-function signature="^glTexParameterI?u?[fi]v\(.*$"> - <modify-argument index="3"><array/></modify-argument> + <modify-argument index="3"><array/></modify-argument> </modify-function> <modify-function signature="glUniform1uiv(int,int,const unsigned int*)"> <modify-argument index="3"><array/></modify-argument> @@ -2949,6 +2972,9 @@ <modify-function signature="borderColor(unsigned int*)const" remove="all"/> <modify-function signature="borderColor(int*)const" remove="all"/> <modify-function signature="borderColor(float*)const" remove="all"/> + <!-- Work around link error introduced by qtbase/d15b02ff291e3124d9bb8ac3b06b704c292f52ab, can be removed once + qtbase/1bfabe35d8178c93e66acef21c01e08980f9ed0d has landed --> + <modify-function signature="setData(int,int,int,int,int,int,int,QOpenGLTexture::PixelFormat,QOpenGLTexture::PixelType,const void*,QOpenGLPixelTransferOptions*const)" remove="all"/> </object-type> <object-type name="QOpenGLTextureBlitter"> <enum-type name="Origin"/> diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt index 4e7642d3a..cbdd9a1c2 100644 --- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt @@ -26,16 +26,16 @@ ${QtMultimedia_GEN_DIR}/qcameracapturebufferformatcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameracapturedestinationcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameracontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraexposurecontrol_wrapper.cpp -# Private destructor: ${QtMultimedia_GEN_DIR}/qcameraexposure_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcameraexposure_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerafeedbackcontrol_wrapper.cpp -# Private destructor: ${${QtMultimedia_GEN_DIR}/qcamerafocus_wrapper.cpp -# needs enums from QCameraFocus ${QtMultimedia_GEN_DIR}/qcameraflashcontrol_wrapper.cpp -# needs enums from QCameraFocus ${QtMultimedia_GEN_DIR}/qcamerafocuscontrol_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcamerafocus_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcameraflashcontrol_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcamerafocuscontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerafocuszone_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamera_frameraterange_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraimagecapturecontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraimagecapture_wrapper.cpp -# Private destructor: ${QtMultimedia_GEN_DIR}/qcameraimageprocessing_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcameraimageprocessing_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraimageprocessingcontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerainfocontrol_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamerainfo_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index f7ac67857..d44c89e96 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -193,7 +193,6 @@ <object-type name="QCameraControl"> <enum-type name="PropertyChangeType"/> </object-type> - <!-- Private destructor <object-type name="QCameraExposure"> <enum-type name="FlashMode" flags="FlashModes"/> <enum-type name="ExposureMode"/> @@ -202,7 +201,6 @@ <modify-function signature="supportedIsoSensitivities(bool*)const" remove="all"/> <modify-function signature="supportedShutterSpeeds(bool*)const" remove="all"/> </object-type> - --> <object-type name="QCameraExposureControl"> <enum-type name="ExposureParameter"/> <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter,bool*)const" remove="all"/> @@ -213,14 +211,12 @@ <value-type name="QCameraFocusZone"> <enum-type name="FocusZoneStatus"/> </value-type> - <!-- Private destructor <object-type name="QCameraFocus"> <enum-type name="FocusMode" flags="FocusModes"/> <enum-type name="FocusPointMode"/> </object-type> - <object-type name="QCameraFlashControl"/> needs enums from QCameraFocus + <object-type name="QCameraFlashControl"/> <object-type name="QCameraFocusControl"/> - --> <value-type name="QCameraInfo"/> <object-type name="QCameraInfoControl"/> <object-type name="QCameraImageCapture"> @@ -230,12 +226,10 @@ <modify-function signature="supportedResolutions(const QImageEncoderSettings &,bool*)const" remove="all"/> </object-type> <object-type name="QCameraImageCaptureControl"/> - <!-- Private destructor <object-type name="QCameraImageProcessing"> <enum-type name="WhiteBalanceMode"/> <enum-type name="ColorFilter"/> </object-type> - --> <object-type name="QCameraImageProcessingControl"> <enum-type name="ProcessingParameter"/> </object-type> diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml index 27c515170..5e864ca43 100644 --- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml @@ -221,6 +221,7 @@ <modify-function signature="setUniformValueArray(int,const GLint*,int)" rename="setUniformValueArrayInt"> <modify-argument index="2" > <replace-type modified-type="PySequence"/> + <array/> </modify-argument> <modify-argument index="3"> <remove-argument /> @@ -237,6 +238,7 @@ <modify-function signature="setUniformValueArray(int,const GLuint*,int)" rename="setUniformValueArrayUint"> <modify-argument index="2" > <replace-type modified-type="PySequence"/> + <array/> </modify-argument> <modify-argument index="3"> <remove-argument /> @@ -445,6 +447,7 @@ <modify-function signature="setUniformValueArray(const char*,const GLint*,int)" rename="setUniformValueArrayInt"> <modify-argument index="2" > <replace-type modified-type="PySequence"/> + <array/> </modify-argument> <modify-argument index="3"> <remove-argument /> @@ -461,6 +464,7 @@ <modify-function signature="setUniformValueArray(const char*,const GLuint*,int)" rename="setUniformValueArrayUint"> <modify-argument index="2" > <replace-type modified-type="PySequence"/> + <array/> </modify-argument> <modify-argument index="3"> <remove-argument /> diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml index 64b4e8412..7a18dac54 100644 --- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml +++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml @@ -100,6 +100,7 @@ <object-type name="QQuickWindow"> <enum-type name="CreateTextureOption" flags="CreateTextureOptions"/> + <enum-type name="NativeObjectType" since="5.14"/> <enum-type name="RenderStage"/> <enum-type name="SceneGraphError"/> <enum-type name="TextRenderType" since="5.10"/> @@ -107,6 +108,7 @@ <object-type name="QSGAbstractRenderer"> <enum-type name="ClearModeBit" flags="ClearMode"/> + <enum-type name="MatrixTransformFlag" flags="MatrixTransformFlags" since="5.14"/> </object-type> <object-type name="QSGBasicGeometryNode"/> <object-type name="QSGClipNode"/> diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 23fb4857e..425dcd7b5 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -461,6 +461,7 @@ <enum-type name="SliderChange"/> </object-type> <object-type name="QActionGroup"> + <enum-type name="ExclusionPolicy" since="5.14"/> <modify-function signature="addAction(QAction*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2950,6 +2951,7 @@ <object-type name="QCommandLinkButton"/> <object-type name="QFileSystemModel" polymorphic-id-expression="qobject_cast<QFileSystemModel*>(%1)"> <enum-type name="Roles"/> + <enum-type name="Option" flags="Options" since="5.14"/> <modify-function signature="setIconProvider(QFileIconProvider*)"> <modify-argument index="1"> <parent index="this" action="add"/> diff --git a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt index cf308c31d..0e0b3d58b 100644 --- a/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWinExtras/CMakeLists.txt @@ -1,6 +1,7 @@ project(QtWinExtras) set(QtWinExtras_SRC +${QtWinExtras_GEN_DIR}/qtwin_wrapper.cpp ${QtWinExtras_GEN_DIR}/qwincolorizationchangeevent_wrapper.cpp ${QtWinExtras_GEN_DIR}/qwincompositionchangeevent_wrapper.cpp ${QtWinExtras_GEN_DIR}/qwinevent_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml b/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml index ec17428a1..db7416a24 100644 --- a/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml +++ b/sources/pyside2/PySide2/QtWinExtras/typesystem_winextras.xml @@ -43,6 +43,10 @@ <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> + <namespace-type name="QtWin"> + <enum-type name="HBitmapFormat"/> + <enum-type name="WindowFlip3DPolicy"/> + </namespace-type> <object-type name="QWinEvent" since="5.2"/> <object-type name="QWinColorizationChangeEvent" since="5.2"/> <object-type name="QWinCompositionChangeEvent" since="5.2"/> diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index 93f7321aa..4c798aef9 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -308,7 +308,7 @@ PyModule_AddStringConstant(module, "__version__", qVersion()); // @snippet qobject-connect static bool isDecorator(PyObject *method, PyObject *self) { - Shiboken::AutoDecRef methodName(PyObject_GetAttrString(method, "__name__")); + Shiboken::AutoDecRef methodName(PyObject_GetAttr(method, Shiboken::PyMagicName::name())); if (!PyObject_HasAttr(self, methodName)) return true; Shiboken::AutoDecRef otherMethod(PyObject_GetAttr(self, methodName)); @@ -811,8 +811,8 @@ _findChildrenHelper(%CPPSELF, %2, reinterpret_cast<PyTypeObject *>(%PYARG_1), %P // @snippet qobject-tr QString result; if (QCoreApplication::instance()) { - PyObject *klass = PyObject_GetAttrString(%PYSELF, "__class__"); - PyObject *cname = PyObject_GetAttrString(klass, "__name__"); + PyObject *klass = PyObject_GetAttr(%PYSELF, Shiboken::PyMagicName::class_()); + PyObject *cname = PyObject_GetAttr(klass, Shiboken::PyMagicName::name()); result = QString(QCoreApplication::instance()->translate(Shiboken::String::toCString(cname), /* %1, %2, QCoreApplication::CodecForTr, %3)); */ %1, %2, %3)); diff --git a/sources/pyside2/PySide2/glue/qtuitools.cpp b/sources/pyside2/PySide2/glue/qtuitools.cpp index 552a9009c..00fc8e44a 100644 --- a/sources/pyside2/PySide2/glue/qtuitools.cpp +++ b/sources/pyside2/PySide2/glue/qtuitools.cpp @@ -54,9 +54,10 @@ static void createChildrenNameAttributes(PyObject *root, QObject *object) const QByteArray name = child->objectName().toLocal8Bit(); if (!name.isEmpty() && !name.startsWith("_") && !name.startsWith("qt_")) { - if (!PyObject_HasAttrString(root, name.constData())) { + Shiboken::AutoDecRef attrName(Py_BuildValue("s", name.constData())); + if (!PyObject_HasAttr(root, attrName)) { Shiboken::AutoDecRef pyChild(%CONVERTTOPYTHON[QObject *](child)); - PyObject_SetAttrString(root, name.constData(), pyChild); + PyObject_SetAttr(root, attrName, pyChild); } createChildrenNameAttributes(root, child); } diff --git a/sources/pyside2/PySide2/support/__init__.py b/sources/pyside2/PySide2/support/__init__.py index dda01474d..8764fb5cb 100644 --- a/sources/pyside2/PySide2/support/__init__.py +++ b/sources/pyside2/PySide2/support/__init__.py @@ -38,3 +38,5 @@ ############################################################################# from shiboken2 import VoidPtr + +#eof diff --git a/sources/pyside2/PySide2/support/deprecated.py b/sources/pyside2/PySide2/support/deprecated.py new file mode 100644 index 000000000..8538826e4 --- /dev/null +++ b/sources/pyside2/PySide2/support/deprecated.py @@ -0,0 +1,80 @@ +# This Python file uses the following encoding: utf-8 +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of Qt for Python. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +from __future__ import print_function, absolute_import + +""" +deprecated.py + +This module contains deprecated things that are removed from the interface. +They are implemented in Python again, together with a deprecation warning. + +Functions that are to be called for + PySide2.<module> must be named + fix_for_<module> . + +Note that this fixing code is run after all initializations, but before the +import is finished. But that is no problem since the module is passed in. +""" + +import warnings +from textwrap import dedent + + +class PySideDeprecationWarningRemovedInQt6(Warning): + pass + + +def constData(self): + cls = self.__class__ + name = cls.__name__ + warnings.warn(dedent(""" + {name}.constData is unpythonic and will be removed in Qt For Python 6.0 . + Please use {name}.data instead.""" + .format(**locals())), PySideDeprecationWarningRemovedInQt6, stacklevel=2) + return cls.data(self) + + +def fix_for_QtGui(QtGui): + for name, cls in QtGui.__dict__.items(): + if name.startswith("QMatrix") and "data" in cls.__dict__: + cls.constData = constData + +# eof diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py index d5bbe5d7c..e60645701 100644 --- a/sources/pyside2/PySide2/support/generate_pyi.py +++ b/sources/pyside2/PySide2/support/generate_pyi.py @@ -161,14 +161,11 @@ class Formatter(Writer): if self.level == 0: self.print() here = self.outfile.tell() - self.print("{spaces}class {class_str}:".format(**locals())) - pos = self.outfile.tell() - yield - if pos == self.outfile.tell(): - # we have not written any function - self.outfile.seek(here) - self.outfile.truncate() + if self.have_body: + self.print("{spaces}class {class_str}:".format(**locals())) + else: self.print("{spaces}class {class_str}: ...".format(**locals())) + yield if "<" in class_name: # This is happening in QtQuick for some reason: ## class QSharedPointer<QQuickItemGrabResult >: |