diff options
Diffstat (limited to 'sources/pyside2/PySide2')
25 files changed, 238 insertions, 1128 deletions
diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 120bc8e52..0ded09f5d 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -100,8 +100,6 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/opengl_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/openglfunctions_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/webkitwidgets_common.xml - DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/templates/xml_common.xml DESTINATION share/PySide2${pyside_SUFFIX}/typesystems) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside2_global.h diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt index 20ed65a67..3820d439e 100644 --- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt @@ -26,22 +26,26 @@ ${QtCore_GEN_DIR}/qbasicmutex_wrapper.cpp ${QtCore_GEN_DIR}/qbasictimer_wrapper.cpp ${QtCore_GEN_DIR}/qbitarray_wrapper.cpp ${QtCore_GEN_DIR}/qbuffer_wrapper.cpp +${QtCore_GEN_DIR}/qbytearray_frombase64result_wrapper.cpp ${QtCore_GEN_DIR}/qbytearray_wrapper.cpp ${QtCore_GEN_DIR}/qbytearraymatcher_wrapper.cpp -${QtCore_GEN_DIR}/qchildevent_wrapper.cpp +${QtCore_GEN_DIR}/qcalendar_wrapper.cpp +${QtCore_GEN_DIR}/qcalendar_yearmonthday_wrapper.cpp ${QtCore_GEN_DIR}/qcborarray_wrapper.cpp ${QtCore_GEN_DIR}/qcborerror_wrapper.cpp ${QtCore_GEN_DIR}/qcbormap_wrapper.cpp ${QtCore_GEN_DIR}/qcborparsererror_wrapper.cpp ${QtCore_GEN_DIR}/qcborstreamreader_wrapper.cpp -${QtCore_GEN_DIR}/qcborstringresultstring_wrapper.cpp -${QtCore_GEN_DIR}/qcborstringresultbytearray_wrapper.cpp ${QtCore_GEN_DIR}/qcborstreamwriter_wrapper.cpp +${QtCore_GEN_DIR}/qcborstringresultbytearray_wrapper.cpp +${QtCore_GEN_DIR}/qcborstringresultstring_wrapper.cpp ${QtCore_GEN_DIR}/qcborvalue_wrapper.cpp +${QtCore_GEN_DIR}/qchildevent_wrapper.cpp ${QtCore_GEN_DIR}/qcollator_wrapper.cpp ${QtCore_GEN_DIR}/qcollatorsortkey_wrapper.cpp ${QtCore_GEN_DIR}/qcommandlineoption_wrapper.cpp ${QtCore_GEN_DIR}/qcommandlineparser_wrapper.cpp +${QtCore_GEN_DIR}/qconcatenatetablesproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qcoreapplication_wrapper.cpp ${QtCore_GEN_DIR}/qcryptographichash_wrapper.cpp ${QtCore_GEN_DIR}/qdatastream_wrapper.cpp @@ -58,9 +62,9 @@ ${QtCore_GEN_DIR}/qeventloop_wrapper.cpp ${QtCore_GEN_DIR}/qeventtransition_wrapper.cpp ${QtCore_GEN_DIR}/qfactoryinterface_wrapper.cpp ${QtCore_GEN_DIR}/qfile_wrapper.cpp -${QtCore_GEN_DIR}/qfileselector_wrapper.cpp ${QtCore_GEN_DIR}/qfiledevice_wrapper.cpp ${QtCore_GEN_DIR}/qfileinfo_wrapper.cpp +${QtCore_GEN_DIR}/qfileselector_wrapper.cpp ${QtCore_GEN_DIR}/qfilesystemwatcher_wrapper.cpp ${QtCore_GEN_DIR}/qfinalstate_wrapper.cpp ${QtCore_GEN_DIR}/qgenericargument_wrapper.cpp @@ -68,13 +72,13 @@ ${QtCore_GEN_DIR}/qgenericreturnargument_wrapper.cpp ${QtCore_GEN_DIR}/qhistorystate_wrapper.cpp ${QtCore_GEN_DIR}/qidentityproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qiodevice_wrapper.cpp +${QtCore_GEN_DIR}/qitemselection_wrapper.cpp +${QtCore_GEN_DIR}/qitemselectionmodel_wrapper.cpp +${QtCore_GEN_DIR}/qitemselectionrange_wrapper.cpp ${QtCore_GEN_DIR}/qjsonarray_wrapper.cpp ${QtCore_GEN_DIR}/qjsondocument_wrapper.cpp ${QtCore_GEN_DIR}/qjsonparseerror_wrapper.cpp ${QtCore_GEN_DIR}/qjsonvalue_wrapper.cpp -${QtCore_GEN_DIR}/qitemselection_wrapper.cpp -${QtCore_GEN_DIR}/qitemselectionmodel_wrapper.cpp -${QtCore_GEN_DIR}/qitemselectionrange_wrapper.cpp ${QtCore_GEN_DIR}/qlibraryinfo_wrapper.cpp ${QtCore_GEN_DIR}/qline_wrapper.cpp ${QtCore_GEN_DIR}/qlinef_wrapper.cpp @@ -107,13 +111,13 @@ ${QtCore_GEN_DIR}/qpointf_wrapper.cpp ${QtCore_GEN_DIR}/qprocess_wrapper.cpp ${QtCore_GEN_DIR}/qprocessenvironment_wrapper.cpp ${QtCore_GEN_DIR}/qpropertyanimation_wrapper.cpp -${QtCore_GEN_DIR}/qrandomgenerator_wrapper.cpp ${QtCore_GEN_DIR}/qrandomgenerator64_wrapper.cpp +${QtCore_GEN_DIR}/qrandomgenerator_wrapper.cpp ${QtCore_GEN_DIR}/qreadlocker_wrapper.cpp ${QtCore_GEN_DIR}/qreadwritelock_wrapper.cpp ${QtCore_GEN_DIR}/qrect_wrapper.cpp ${QtCore_GEN_DIR}/qrectf_wrapper.cpp -${QtCore_GEN_DIR}/qregexp_wrapper.cpp +${QtCore_GEN_DIR}/qrecursivemutex_wrapper.cpp ${QtCore_GEN_DIR}/qregularexpression_wrapper.cpp ${QtCore_GEN_DIR}/qregularexpressionmatch_wrapper.cpp ${QtCore_GEN_DIR}/qregularexpressionmatchiterator_wrapper.cpp @@ -132,8 +136,8 @@ ${QtCore_GEN_DIR}/qsizef_wrapper.cpp ${QtCore_GEN_DIR}/qsocketdescriptor_wrapper.cpp ${QtCore_GEN_DIR}/qsocketnotifier_wrapper.cpp ${QtCore_GEN_DIR}/qsortfilterproxymodel_wrapper.cpp -${QtCore_GEN_DIR}/qstate_wrapper.cpp ${QtCore_GEN_DIR}/qstandardpaths_wrapper.cpp +${QtCore_GEN_DIR}/qstate_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_signalevent_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_wrappedevent_wrapper.cpp ${QtCore_GEN_DIR}/qstatemachine_wrapper.cpp @@ -145,10 +149,6 @@ ${QtCore_GEN_DIR}/qt_wrapper.cpp ${QtCore_GEN_DIR}/qtemporarydir_wrapper.cpp ${QtCore_GEN_DIR}/qtemporaryfile_wrapper.cpp ${QtCore_GEN_DIR}/qtextboundaryfinder_wrapper.cpp -${QtCore_GEN_DIR}/qtextcodec_converterstate_wrapper.cpp -${QtCore_GEN_DIR}/qtextcodec_wrapper.cpp -${QtCore_GEN_DIR}/qtextdecoder_wrapper.cpp -${QtCore_GEN_DIR}/qtextencoder_wrapper.cpp ${QtCore_GEN_DIR}/qtextstream_wrapper.cpp ${QtCore_GEN_DIR}/qtextstreammanipulator_wrapper.cpp ${QtCore_GEN_DIR}/qthread_wrapper.cpp @@ -157,9 +157,10 @@ ${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}/qtimezone_wrapper.cpp ${QtCore_GEN_DIR}/qtranslator_wrapper.cpp +${QtCore_GEN_DIR}/qtransposeproxymodel_wrapper.cpp ${QtCore_GEN_DIR}/qurl_wrapper.cpp ${QtCore_GEN_DIR}/qurlquery_wrapper.cpp ${QtCore_GEN_DIR}/quuid_wrapper.cpp @@ -176,33 +177,11 @@ ${QtCore_GEN_DIR}/qxmlstreamnotationdeclaration_wrapper.cpp ${QtCore_GEN_DIR}/qxmlstreamreader_wrapper.cpp ${QtCore_GEN_DIR}/qxmlstreamwriter_wrapper.cpp - ${SPECIFIC_OS_FILES} # module is always needed ${QtCore_GEN_DIR}/qtcore_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.13.0 - OR Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.13.0) - list(APPEND QtCore_SRC - ${QtCore_GEN_DIR}/qconcatenatetablesproxymodel_wrapper.cpp - ${QtCore_GEN_DIR}/qtransposeproxymodel_wrapper.cpp) -endif() - -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.14.0 - OR Qt${QT_MAJOR_VERSION}Core_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() - -if (Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_EQUAL 5.15.0 - OR Qt${QT_MAJOR_VERSION}Core_VERSION VERSION_GREATER 5.15.0) - list(APPEND QtCore_SRC - ${QtCore_GEN_DIR}/qbytearray_frombase64result_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 1fc0c8d23..b8a78f8de 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -170,7 +170,6 @@ <enum-type name="QtMsgType"/> - <enum-type name="QCborSimpleType" since="5.12"/> <enum-type name="QCborKnownTags" since="5.12"/> @@ -189,6 +188,8 @@ <primitive-type name="long long"/> <primitive-type name="qlonglong" target-lang-api-name="PyLong"/> <primitive-type name="qulonglong" target-lang-api-name="PyLong"/> + <primitive-type name="qsizetype" target-lang-api-name="PyLong"/> + <primitive-type name="size_t" target-lang-api-name="PyLong"/> <primitive-type name="short"/> <primitive-type name="signed short"/> <primitive-type name="signed short int"/> @@ -354,7 +355,7 @@ <include file-name="qcborstream.h" location="global"/> <value-type name="StringResult" generate="no"/> <!-- 64bit (qsizetype = long long) --> - <modify-function signature="readStringChunk(char*,long long)" remove="all"/> + <modify-function signature="readStringChunk(char*,qsizetype)" remove="all"/> <!-- 32bit (qsizetype = int) --> <modify-function signature="readStringChunk(char*,int)" remove="all"/> </object-type> @@ -405,6 +406,7 @@ </conversion-rule> </container-type> + <!-- FIXME: Which one is it going to be? --> <container-type name="QList" type="list"> <include file-name="QList" location="global"/> <conversion-rule> @@ -419,21 +421,6 @@ </conversion-rule> </container-type> - <container-type name="QVector" type="vector"> - <include file-name="QVector" location="global"/> - <conversion-rule> - <native-to-target> - <insert-template name="cppvector_to_pylist_conversion"/> - </native-to-target> - <target-to-native> - <add-conversion type="PySequence"> - <insert-template name="pyseq_to_cppvector_conversion"/> - </add-conversion> - </target-to-native> - </conversion-rule> - - </container-type> - <container-type name="QStack" type="stack"> <include file-name="QStack" location="global"/> <conversion-rule> @@ -462,20 +449,6 @@ </conversion-rule> </container-type> - <container-type name="QLinkedList" type="linked-list"> - <include file-name="QLinkedList" location="global"/> - <conversion-rule> - <native-to-target> - <insert-template name="cpplist_to_pylist_conversion"/> - </native-to-target> - <target-to-native> - <add-conversion type="PySequence"> - <insert-template name="pyseq_to_cpplist_conversion"/> - </add-conversion> - </target-to-native> - </conversion-rule> - </container-type> - <container-type name="QHash" type="hash"> <include file-name="QHash" location="global"/> <!-- Include to make enum flags work. --> @@ -634,6 +607,7 @@ <enum-type name="PenCapStyle"/> <enum-type name="PenJoinStyle"/> <enum-type name="PenStyle"/> + <enum-type name="ReturnByValueConstant" since="6.0"/> <enum-type name="ScreenOrientation" flags="ScreenOrientations" since="5.0"/> <enum-type name="ScrollBarPolicy"/> <enum-type name="ScrollPhase" since="5.2"/> @@ -827,7 +801,6 @@ <extra-includes> <include file-name="datetime.h" location="global"/> </extra-includes> - <enum-type name="MonthNameType"/> <add-function signature="__repr__" return-type="PyObject"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> @@ -848,7 +821,7 @@ <add-function signature="toPython()" return-type="PyObject"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qdate-topython"/> </add-function> - <modify-function signature="getDate(int*,int*,int*)" > + <modify-function signature="getDate(int*,int*,int*)const" > <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -1310,8 +1283,6 @@ <rename to="format"/> </modify-argument> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toUInt(QStringRef,bool*)const" remove="all"/> <modify-function signature="toUInt(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1324,8 +1295,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toULongLong(QStringRef,bool*)const" remove="all"/> <modify-function signature="toULongLong(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1338,8 +1307,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions --> - <modify-function signature="toDouble(QStringRef,bool*)const" remove="all"/> <modify-function signature="toDouble(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1352,8 +1319,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions --> - <modify-function signature="toFloat(QStringRef,bool*)const" remove="all"/> <modify-function signature="toFloat(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1366,8 +1331,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toInt(QStringRef,bool*)const" remove="all"/> <modify-function signature="toInt(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1379,8 +1342,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toLongLong(QStringRef,bool*)const" remove="all"/> <modify-function signature="toLongLong(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1392,8 +1353,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toShort(QStringRef,bool*)const" remove="all"/> <modify-function signature="toShort(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1405,8 +1364,6 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <!-- Qt5: ignore the new QStringRef versions, int arg is gone --> - <modify-function signature="toUShort(QStringRef,bool*)const" remove="all"/> <modify-function signature="toUShort(QString,bool*)const"> <modify-argument index="2"> <remove-argument /> @@ -1505,7 +1462,7 @@ <enum-type name="CheckIndexOption" flags="CheckIndexOptions" since="5.11"/> <enum-type name="LayoutChangeHint"/> <!-- This function was replaced by a added function --> - <modify-function signature="createIndex(int,int,void*)const" remove="all"/> + <modify-function signature="createIndex(int,int,const void*)const" remove="all"/> <!-- This function is the same as createIndex(int, int, int)const --> <modify-function signature="createIndex(int,int,quintptr)const"> <modify-argument index="3"> @@ -1586,10 +1543,6 @@ <reference-count action="set"/> </modify-argument> </modify-function> - <!--### Obsolete in 4.3--> - <modify-function signature="clear()" remove="all"/> - <modify-function signature="filterChanged()" remove="all"/> - <!--### End of obsolete section --> </object-type> <object-type name="QIdentityProxyModel"/> <object-type name="QTransposeProxyModel" since="5.13"/> @@ -1731,12 +1684,6 @@ <replace-default-expression with="QString()"/> </modify-argument> </add-function> - <add-function signature="findChildren(PyTypeObject*,const QRegExp&)" return-type="PySequence*" > - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchildren"/> - <modify-argument index="return"> - <parent index="this" action="add"/> - </modify-argument> - </add-function> <add-function signature="findChildren(PyTypeObject*,const QRegularExpression&)" return-type="PySequence*" > <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchildren"/> <modify-argument index="return"> @@ -1819,64 +1766,8 @@ </inject-code> </add-function> </value-type> - <value-type name="QRegExp"> - <enum-type name="CaretMode"/> - <enum-type name="PatternSyntax"/> - <extra-includes> - <include file-name="QStringList" location="global"/> - </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="'%s', %i, %i"/> - <replace from="%REPR_ARGS" to="qPrintable(%CPPSELF.pattern()), (int)%CPPSELF.caseSensitivity(), (int)%CPPSELF.patternSyntax()"/> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="sii"/> - <replace from="%REDUCE_ARGS" to="qPrintable(%CPPSELF.pattern()), (int)%CPPSELF.caseSensitivity(), (int)%CPPSELF.patternSyntax()"/> - </insert-template> - </inject-code> - </add-function> - <add-function signature="replace(QString,QString)" return-type="QString"> - <modify-argument index="1"> - <rename to="sourceString"/> - </modify-argument> - <modify-argument index="2"> - <rename to="after"/> - </modify-argument> - <inject-documentation format="target" mode="append"> - Replaces every occurrence of the regular expression in *sourceString* with *after*. - Returns a new Python string with the modified contents. For example: - - :: - - s = "Banana" - re = QRegExp("a[mn]") - s = re.replace(s, "ox") - # s == "Boxoxa" - - - For regular expressions containing capturing parentheses, occurrences of \1, \2, ..., in *after* - are replaced with rx.cap(1), cap(2), ... - - :: - - t = "A <i>bon mot</i>." - re = QRegExp("<i>([^<]*)</i>") - t = re.replace(t, "\\emph{\\1}") - # t == "A \\emph{bon mot}." - - </inject-documentation> - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qregexp-replace"/> - </add-function> - </value-type> - <value-type name="QRegularExpression"> + <enum-type name="WildcardConversionOption" flags="WildcardConversionOptions" since="6.0"/> <enum-type name="MatchOption" flags="MatchOptions"/> <enum-type name="MatchType"/> <enum-type name="PatternOption" flags="PatternOptions"/> @@ -1918,56 +1809,41 @@ <!-- ### These overloads must be removed accept strings with \x00 in their contents --> <modify-function signature="append(const char*,int)" remove="all"/> <modify-function signature="append(const char*)" remove="all"/> - <modify-function signature="append(QString)" remove="all"/> <modify-function signature="contains(const char*)const" remove="all"/> <modify-function signature="count(const char*)const" remove="all"/> <modify-function signature="endsWith(const char*)const" remove="all"/> <modify-function signature="indexOf(const char*,int)const" remove="all"/> <modify-function signature="indexOf(char,int)const" remove="all"/> - <modify-function signature="indexOf(QString,int)const" remove="all"/> <modify-function signature="insert(int,const char*)" remove="all"/> <modify-function signature="insert(int,char)" remove="all"/> <modify-function signature="insert(int,const char*,int)" since="4.6" remove="all"/> - <modify-function signature="insert(int,QString)" remove="all"/> <modify-function signature="lastIndexOf(const char*,int)const" remove="all"/> - <modify-function signature="lastIndexOf(QString,int)const" remove="all"/> <modify-function signature="lastIndexOf(char,int)const" remove="all"/> <modify-function signature="prepend(const char*)" remove="all"/> <modify-function signature="prepend(const char*,int)" since="4.6" remove="all"/> <modify-function signature="replace(QByteArray,const char*)" remove="all"/> <modify-function signature="replace(const char*,int,const char*,int)" remove="all"/> - <modify-function signature="replace(QString,const char*)" remove="all"/> <modify-function signature="replace(const char*,QByteArray)" remove="all"/> <modify-function signature="replace(const char*,const char*)" remove="all"/> <modify-function signature="replace(int,int,const char*)" remove="all"/> <modify-function signature="replace(int,int,const char*,int)" since="4.6" remove="all"/> <modify-function signature="replace(char,const char*)" remove="all"/> - <modify-function signature="replace(char,QString)" remove="all"/> <modify-function signature="startsWith(const char*)const" remove="all"/> - <modify-function signature="operator==(QString)const" remove="all"/> <modify-function signature="operator==(const char*,QByteArray)" remove="all"/> <modify-function signature="operator==(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator>(QString)const" remove="all"/> <modify-function signature="operator>(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator>=(QString)const" remove="all"/> <modify-function signature="operator>=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>=(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator<(QString)const" remove="all"/> <modify-function signature="operator<(const char*,QByteArray)" remove="all"/> - <modify-function signature="operator<=(QString)const" remove="all"/> <modify-function signature="operator<=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator<=(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator!=(QString)const" remove="all"/> <modify-function signature="operator!=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator!=(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator+=(QString)" remove="all"/> <modify-function signature="operator+=(const char*)" remove="all"/> <modify-function signature="operator+(QByteArray,const char*)" remove="all"/> <modify-function signature="operator+(const char*,QByteArray)" remove="all"/> <modify-function signature="operator+(QByteArray,const char*)" remove="all"/> - <modify-function signature="operator+(QString,QByteArray)" remove="all"/> - <modify-function signature="operator+(QByteArray,QString)" remove="all"/> <add-function signature="operator+(PyBytes,QByteArray)"> <inject-code file="../glue/qtcore.cpp" snippet="qbytearray-operatorplus-1"/> </add-function> @@ -2053,15 +1929,18 @@ <modify-function signature="operator>(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator[](int)const" remove="all"/> - <modify-function signature="operator[](uint)const" remove="all"/> <!-- Those types have the same representation in Python, an overload would be useless and cause overflow errors. --> <modify-function signature="setNum(uint,int)" remove="all"/> <modify-function signature="setNum(ushort,int)" remove="all"/> <modify-function signature="setNum(float,char,int)" remove="all"/> <modify-function signature="setNum(short,int)" remove="all"/> + <modify-function signature="setNum(long,int)" remove="all"/> + <modify-function signature="setNum(ulong,int)" remove="all"/> <modify-function signature="setNum(qulonglong,int)" remove="all"/> <modify-function signature="number(uint,int)" remove="all"/> + <modify-function signature="number(long,int)" remove="all"/> + <modify-function signature="number(ulong,int)" remove="all"/> <modify-function signature="number(qulonglong,int)" remove="all"/> <!--### --> @@ -2199,7 +2078,7 @@ <!-- Qt5: had to move QAbstractEventDispatcher into os-specific files because of Windows --> <object-type name="QAbstractNativeEventFilter"> <!-- see QWidget::nativeEvent(), QWindow::nativeEvent() --> - <modify-function signature="nativeEventFilter(const QByteArray&,void*,long*)"> + <modify-function signature="nativeEventFilter(const QByteArray&,void*,qintptr*)"> <modify-argument index="3"> <remove-argument/> <conversion-rule class="native"> @@ -2313,7 +2192,7 @@ </object-type> <object-type name="QCryptographicHash"> <enum-type name="Algorithm"/> - <modify-function signature="addData(const char*,int)"> + <modify-function signature="addData(const char*,qsizetype)"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -2409,38 +2288,6 @@ <include file-name="QUrl" location="global"/> </extra-includes> </object-type> - <object-type name="QTextCodec"> - <enum-type name="ConversionFlag" flags="ConversionFlags"/> - - <object-type name="ConverterState"> - <include file-name="QTextCodec" location="global"/> - <modify-function signature="ConverterState(QFlags<QTextCodec::ConversionFlag>)"> - <modify-argument index="1"> - <replace-default-expression with="QTextCodec::DefaultConversion"/> - </modify-argument> - </modify-function> - </object-type> - - <modify-function signature="setCodecForLocale(QTextCodec*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <!-- fromUnicode(QString) does the job --> - <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all"/> - <modify-function signature="convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const" remove="all"/> - <!-- this causes a warning that I cannot avoid. See suppressed warning at the end. --> - </object-type> - <object-type name="QTextDecoder"> - <!-- ### toUnicode(QByteArray) does the job --> - <modify-function signature="toUnicode(const char*,int)" remove="all"/> - <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/> - <!-- ### --> - </object-type> - <object-type name="QTextEncoder"> - <!-- fromUnicode(QString) does the job --> - <modify-function signature="fromUnicode(const QChar*,int)" remove="all"/> - </object-type> <object-type name="QTimeLine"> <enum-type name="CurveShape"/> <enum-type name="Direction"/> @@ -2496,7 +2343,6 @@ <modify-function signature="readAllStandardOutput()" allow-thread="yes"/> <modify-function signature="readAllStandardError()" allow-thread="yes"/> <modify-function signature="execute(QString,QStringList)" allow-thread="yes"/> - <modify-function signature="execute(QString)" allow-thread="yes"/> <modify-function signature="startDetached(QString,QStringList,QString,qint64*)"> <modify-argument index="4"> <remove-argument /> @@ -2511,10 +2357,6 @@ <add-function signature="pid()" return-type="long"> <inject-code file="../glue/qtcore.cpp" snippet="qprocess-pid"/> </add-function> - <!--### Obsolete in 4.3--> - <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> - <modify-function signature="readChannelMode()const" remove="all"/> - <!-- ### --> </object-type> <object-type name="QSignalMapper"/> @@ -2593,12 +2435,6 @@ <!--### Obsolete in 4.3--> <modify-function signature="setSystemIniPath(const QString&)" remove="all"/> <modify-function signature="setUserIniPath(const QString&)" remove="all"/> - <!--### Obsolete in 4.3--> - <modify-function signature="iniCodec()const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> <!-- PYSIDE-1010: We remove the original implementation of value() to include the optional parameter --> <modify-function signature="value(const QString&,const QVariant&)const" remove="all"/> @@ -2885,11 +2721,6 @@ <object-type name="QXmlStreamWriter"> <!-- Removed because it expect QString to be mutable --> <modify-function signature="QXmlStreamWriter(QString*)" remove="all"/> - <modify-function signature="codec()const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - </modify-function> </object-type> <value-type name="QModelIndex" hash-function="qHash"> <modify-function signature="internalPointer()const"> diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index dcc5e29cf..f574b8081 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -1,10 +1,6 @@ project(QtGui) -if (${QT_MAJOR_VERSION} GREATER_EQUAL 6) - qt6_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") -else() - qt5_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") -endif() +qt_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside2_SOURCE_DIR}/qpytextobject.h") set(QtGui_DROPPED_ENTRIES) @@ -12,7 +8,6 @@ get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui PROPERTY QT_ENABLED_PUBLIC_FEATURES) set(QtGui_SRC -${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_paintcontext_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_selection_wrapper.cpp ${QtGui_GEN_DIR}/qabstracttextdocumentlayout_wrapper.cpp @@ -31,13 +26,16 @@ ${QtGui_GEN_DIR}/qaccessibletextselectionevent_wrapper.cpp ${QtGui_GEN_DIR}/qaccessibletextupdateevent_wrapper.cpp ${QtGui_GEN_DIR}/qaccessiblevaluechangeevent_wrapper.cpp ${QtGui_GEN_DIR}/qaccessiblevalueinterface_wrapper.cpp +${QtGui_GEN_DIR}/qaction_wrapper.cpp ${QtGui_GEN_DIR}/qactionevent_wrapper.cpp +${QtGui_GEN_DIR}/qactiongroup_wrapper.cpp ${QtGui_GEN_DIR}/qbackingstore_wrapper.cpp ${QtGui_GEN_DIR}/qbitmap_wrapper.cpp ${QtGui_GEN_DIR}/qbrush_wrapper.cpp ${QtGui_GEN_DIR}/qclipboard_wrapper.cpp ${QtGui_GEN_DIR}/qcloseevent_wrapper.cpp ${QtGui_GEN_DIR}/qcolor_wrapper.cpp +${QtGui_GEN_DIR}/qcolorspace_wrapper.cpp ${QtGui_GEN_DIR}/qconicalgradient_wrapper.cpp ${QtGui_GEN_DIR}/qcontextmenuevent_wrapper.cpp ${QtGui_GEN_DIR}/qcursor_wrapper.cpp @@ -70,6 +68,7 @@ ${QtGui_GEN_DIR}/qimage_wrapper.cpp ${QtGui_GEN_DIR}/qimageiohandler_wrapper.cpp ${QtGui_GEN_DIR}/qimagereader_wrapper.cpp ${QtGui_GEN_DIR}/qimagewriter_wrapper.cpp +${QtGui_GEN_DIR}/qinputdevice_wrapper.cpp ${QtGui_GEN_DIR}/qinputevent_wrapper.cpp ${QtGui_GEN_DIR}/qinputmethod_wrapper.cpp ${QtGui_GEN_DIR}/qinputmethodevent_attribute_wrapper.cpp @@ -79,7 +78,6 @@ ${QtGui_GEN_DIR}/qintvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qkeyevent_wrapper.cpp ${QtGui_GEN_DIR}/qkeysequence_wrapper.cpp ${QtGui_GEN_DIR}/qlineargradient_wrapper.cpp -${QtGui_GEN_DIR}/qmatrix_wrapper.cpp ${QtGui_GEN_DIR}/qmatrix2x2_wrapper.cpp ${QtGui_GEN_DIR}/qmatrix2x3_wrapper.cpp ${QtGui_GEN_DIR}/qmatrix2x4_wrapper.cpp @@ -95,20 +93,8 @@ ${QtGui_GEN_DIR}/qmovie_wrapper.cpp ${QtGui_GEN_DIR}/qnativegestureevent_wrapper.cpp ${QtGui_GEN_DIR}/qoffscreensurface_wrapper.cpp ${QtGui_GEN_DIR}/qopenglcontextgroup_wrapper.cpp -${QtGui_GEN_DIR}/qopengldebuglogger_wrapper.cpp -${QtGui_GEN_DIR}/qopengldebugmessage_wrapper.cpp ${QtGui_GEN_DIR}/qopenglextrafunctions_wrapper.cpp -${QtGui_GEN_DIR}/qopenglframebufferobjectformat_wrapper.cpp ${QtGui_GEN_DIR}/qopenglfunctions_wrapper.cpp -# Compile error on Windows: ${QtGui_GEN_DIR}/qopenglpaintdevice_wrapper.cpp -${QtGui_GEN_DIR}/qopenglpixeltransferoptions_wrapper.cpp -${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp -${QtGui_GEN_DIR}/qopengltexture_wrapper.cpp -${QtGui_GEN_DIR}/qopengltextureblitter_wrapper.cpp -${QtGui_GEN_DIR}/qopenglversionprofile_wrapper.cpp -${QtGui_GEN_DIR}/qopenglvertexarrayobject_wrapper.cpp -${QtGui_GEN_DIR}/qopenglvertexarrayobject_binder_wrapper.cpp -${QtGui_GEN_DIR}/qopenglwindow_wrapper.cpp ${QtGui_GEN_DIR}/qpagedpaintdevice_margins_wrapper.cpp ${QtGui_GEN_DIR}/qpagedpaintdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpagelayout_wrapper.cpp @@ -127,18 +113,18 @@ ${QtGui_GEN_DIR}/qpalette_wrapper.cpp ${QtGui_GEN_DIR}/qpdfwriter_wrapper.cpp ${QtGui_GEN_DIR}/qpen_wrapper.cpp ${QtGui_GEN_DIR}/qpicture_wrapper.cpp -${QtGui_GEN_DIR}/qpictureio_wrapper.cpp ${QtGui_GEN_DIR}/qpixmap_wrapper.cpp ${QtGui_GEN_DIR}/qpixmapcache_key_wrapper.cpp ${QtGui_GEN_DIR}/qpixmapcache_wrapper.cpp ${QtGui_GEN_DIR}/qpixelformat_wrapper.cpp +${QtGui_GEN_DIR}/qpointerevent_wrapper.cpp +${QtGui_GEN_DIR}/qpointingdevice_wrapper.cpp ${QtGui_GEN_DIR}/qpointingdeviceuniqueid_wrapper.cpp ${QtGui_GEN_DIR}/qpolygon_wrapper.cpp ${QtGui_GEN_DIR}/qpolygonf_wrapper.cpp ${QtGui_GEN_DIR}/qpytextobject_wrapper.cpp ${QtGui_GEN_DIR}/qquaternion_wrapper.cpp ${QtGui_GEN_DIR}/qradialgradient_wrapper.cpp -${QtGui_GEN_DIR}/qregexpvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qregularexpressionvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qregion_wrapper.cpp ${QtGui_GEN_DIR}/qresizeevent_wrapper.cpp @@ -148,14 +134,11 @@ ${QtGui_GEN_DIR}/qshowevent_wrapper.cpp ${QtGui_GEN_DIR}/qstandarditem_wrapper.cpp ${QtGui_GEN_DIR}/qstandarditemmodel_wrapper.cpp ${QtGui_GEN_DIR}/qstatustipevent_wrapper.cpp -${QtGui_GEN_DIR}/qopenglbuffer_wrapper.cpp ${QtGui_GEN_DIR}/qopenglcontext_wrapper.cpp ${QtGui_GEN_DIR}/qaccessible_state_wrapper.cpp ${QtGui_GEN_DIR}/qaccessibleinterface_wrapper.cpp ${QtGui_GEN_DIR}/qscreen_wrapper.cpp -${QtGui_GEN_DIR}/qopenglshader_wrapper.cpp -#${QtGui_GEN_DIR}/qopenglshaderprogram_wrapper.cpp -${QtGui_GEN_DIR}/qopenglframebufferobject_wrapper.cpp +${QtGui_GEN_DIR}/qshortcut_wrapper.cpp ${QtGui_GEN_DIR}/qrasterwindow_wrapper.cpp ${QtGui_GEN_DIR}/qrawfont_wrapper.cpp ${QtGui_GEN_DIR}/qscrollevent_wrapper.cpp @@ -199,11 +182,13 @@ ${QtGui_GEN_DIR}/qtexttablecell_wrapper.cpp ${QtGui_GEN_DIR}/qtexttablecellformat_wrapper.cpp ${QtGui_GEN_DIR}/qtexttableformat_wrapper.cpp ${QtGui_GEN_DIR}/qtoolbarchangeevent_wrapper.cpp -${QtGui_GEN_DIR}/qtouchdevice_wrapper.cpp ${QtGui_GEN_DIR}/qtouchevent_touchpoint_wrapper.cpp ${QtGui_GEN_DIR}/qtouchevent_wrapper.cpp ${QtGui_GEN_DIR}/qtransform_wrapper.cpp ${QtGui_GEN_DIR}/qt_wrapper.cpp +${QtGui_GEN_DIR}/qundocommand_wrapper.cpp +${QtGui_GEN_DIR}/qundogroup_wrapper.cpp +${QtGui_GEN_DIR}/qundostack_wrapper.cpp ${QtGui_GEN_DIR}/qvalidator_wrapper.cpp ${QtGui_GEN_DIR}/qvector2d_wrapper.cpp ${QtGui_GEN_DIR}/qvector3d_wrapper.cpp @@ -216,24 +201,6 @@ ${QtGui_GEN_DIR}/qwindowstatechangeevent_wrapper.cpp ${QtGui_GEN_DIR}/qtgui_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Gui_VERSION VERSION_EQUAL 5.14.0 - OR Qt${QT_MAJOR_VERSION}Gui_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) -if(_opengles2Index GREATER -1) - list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery) - message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Dropping Desktop OpenGL classes (GLES2)") -else() - list(APPEND QtGui_SRC - ${QtGui_GEN_DIR}/qopengltimemonitor_wrapper.cpp - ${QtGui_GEN_DIR}/qopengltimerquery_wrapper.cpp) - message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Adding Desktop OpenGL classes") -endif() - configure_file("${QtGui_SOURCE_DIR}/typesystem_gui.xml.in" "${QtGui_BINARY_DIR}/typesystem_gui.xml" @ONLY) diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 4be4fc8f3..06ea29d14 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -247,6 +247,40 @@ <object-type name="QAccessibleTextUpdateEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::TextUpdated"/> <object-type name="QAccessibleValueChangeEvent" copyable="false" polymorphic-id-expression="%1->type() == QAccessible::ValueChanged"/> + <object-type name="QAction"> + <enum-type name="ActionEvent"/> + <enum-type name="MenuRole"/> + <enum-type name="Priority" since="4.6"/> + <modify-function signature="setMenu(QMenu*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="triggered(bool)" allow-thread="yes"/> + </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"/> + </modify-argument> + </modify-function> + <modify-function signature="removeAction(QAction*)"> + <modify-argument index="1"> + <parent index="this" action="remove"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QShortcut"> + <add-function signature="QShortcut(QKeySequence&,QObject*,PyCallable*,Qt::ShortcutContext)"> + <modify-argument index="4"> + <replace-default-expression with="Qt::WindowShortcut"/> + </modify-argument> + <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qshortcut-1"/> + <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qshortcut-2"/> + </add-function> + </object-type> + <value-type name="QTransform"> <enum-type name="TransformationType"/> <add-function signature="__repr__" return-type="PyObject*"> @@ -405,10 +439,10 @@ <modify-function signature="operator QVariant()const" remove="all"/> </value-type> <value-type name="QPicture" > - <modify-function signature="load(QIODevice*,const char*)" allow-thread="yes"/> - <modify-function signature="load(const QString&,const char*)" allow-thread="yes"/> - <modify-function signature="save(QIODevice*,const char*)" allow-thread="yes"/> - <modify-function signature="save(const QString&,const char*)" allow-thread="yes"/> + <modify-function signature="load(QIODevice*)" allow-thread="yes"/> + <modify-function signature="load(const QString&)" allow-thread="yes"/> + <modify-function signature="save(QIODevice*)" allow-thread="yes"/> + <modify-function signature="save(const QString&)" allow-thread="yes"/> <!-- See bug 759 --> <modify-function signature="data()const"> <modify-argument index="return"> @@ -501,7 +535,6 @@ </value-type> <value-type name="QPolygon"> <extra-includes> - <include file-name="QMatrix" location="global"/> <include file-name="QTransform" location="global"/> </extra-includes> <add-function signature="__reduce__" return-type="PyObject*"> @@ -527,7 +560,6 @@ </value-type> <value-type name="QPolygonF"> <extra-includes> - <include file-name="QMatrix" location="global"/> <include file-name="QTransform" location="global"/> </extra-includes> <!-- ### A QVector parameter, for no defined type, will generate wrong code. --> @@ -655,70 +687,6 @@ </modify-function> </value-type> - <!-- Qt5: this _should_ be obsolete, but QImage is still using it... --> - <value-type name="QMatrix"> - <extra-includes> - <include file-name="QPainterPath" location="global"/> - </extra-includes> - <add-function signature="__repr__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="repr_code"> - <replace from="%REPR_FORMAT" to="%f, %f, %f, %f, %f, %f"/> - <replace from="%REPR_ARGS" - to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.dx(), %CPPSELF.dy()"/> - </insert-template> - </inject-code> - </add-function> - - <add-function signature="__reduce__" return-type="PyObject*"> - <inject-code class="target" position="beginning"> - <insert-template name="reduce_code"> - <replace from="%REDUCE_FORMAT" to="dddddd"/> - <replace from="%REDUCE_ARGS" to="%CPPSELF.m11(), %CPPSELF.m12(), %CPPSELF.m21(), %CPPSELF.m22(), %CPPSELF.dx(), %CPPSELF.dy()"/> - </insert-template> - </inject-code> - </add-function> - <modify-function signature="map(int,int,int*,int*)const"> - <modify-argument index="3"> - <remove-argument /> - </modify-argument> - <modify-argument index="4"> - <remove-argument /> - </modify-argument> - <inject-code> - <insert-template name="qmatrix_map"/> - </inject-code> - </modify-function> - <modify-function signature="map(qreal,qreal,qreal*,qreal*)const"> - <modify-argument index="3"> - <remove-argument /> - </modify-argument> - <modify-argument index="4"> - <remove-argument /> - </modify-argument> - <inject-code> - <insert-template name="qmatrix_map"/> - </inject-code> - </modify-function> - <modify-function signature="map(const QPoint&)const"> - <modify-argument index="return"> - <replace-type modified-type="QPoint"/> - </modify-argument> - <inject-code file="../glue/qtgui.cpp" snippet="qmatrix-map-point" /> - </modify-function> - <modify-function signature="inverted(bool*)const"> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="PyTuple"/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_bool*"/> - </inject-code> - </modify-function> - </value-type> - <value-type name="QConicalGradient" polymorphic-id-expression="%1->type() == QGradient::ConicalGradient"/> <value-type name="QFontInfo"/> <value-type name="QRadialGradient" polymorphic-id-expression="%1->type() == QGradient::RadialGradient"/> @@ -756,7 +724,6 @@ <enum-type name="InvertMode"/> <extra-includes> <include file-name="QStringList" location="global"/> - <include file-name="QMatrix" location="global"/> </extra-includes> <modify-function signature="load(const QString&, const char*)" allow-thread="yes"/> @@ -764,7 +731,7 @@ <modify-function signature="save(const QString&,const char*,int)const" allow-thread="yes"/> <modify-function signature="save(QIODevice*,const char*,int)const" allow-thread="yes"/> - <modify-function signature="QImage(uchar*,int,int,int,QImage::Format,QImageCleanupFunction,void*)"> + <modify-function signature="QImage(uchar*,int,int,qsizetype,QImage::Format,QImageCleanupFunction,void*)"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> @@ -801,7 +768,7 @@ </add-function> <!-- The non-const versions are already used --> - <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format,QImageCleanupFunction,void*)" remove="all"/> + <modify-function signature="QImage(const uchar*,int,int,qsizetype,QImage::Format,QImageCleanupFunction,void*)" remove="all"/> <modify-function signature="QImage(const uchar*,int,int,QImage::Format,QImageCleanupFunction,void*)" remove="all"/> <!-- ### --> @@ -909,7 +876,7 @@ <inject-code class="target" position="beginning" file="../glue/qtgui.cpp" snippet="qcolor"/> </add-function> <!-- get* methods. Inject code --> - <modify-function signature="getCmyk(int*,int*,int*,int*,int*)"> + <modify-function signature="getCmyk(int*,int*,int*,int*,int*)const"> <modify-argument index="0"> <replace-type modified-type="PyObject*"/> </modify-argument> @@ -936,7 +903,7 @@ </insert-template> </inject-code> </modify-function> - <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)"> + <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)const"> <modify-argument index="0"> <replace-type modified-type="PyObject*"/> </modify-argument> @@ -1120,7 +1087,7 @@ </inject-code> </modify-function> - <modify-function signature="width(QChar)const" rename="widthChar"> + <modify-function signature="horizontalAdvance(QChar)const" rename="horizontalAdvanceChar"> <modify-argument index="1"> <replace-type modified-type="char"/> </modify-argument> @@ -1156,7 +1123,7 @@ </inject-code> </modify-function> - <modify-function signature="width(QChar)const" rename="widthChar"> + <modify-function signature="horizontalAdvance(QChar)const" rename="horizontalAdvanceChar"> <modify-argument index="1"> <replace-type modified-type="char"/> </modify-argument> @@ -1258,15 +1225,6 @@ <object-type name="QIntValidator"/> <object-type name="QPainterPathStroker" copyable="false"/> - <object-type name="QPictureIO"> - <modify-function signature="setIODevice(QIODevice*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="read()" allow-thread="yes"/> - <modify-function signature="write()" allow-thread="yes"/> - </object-type> <object-type name="QPixmapCache"> <value-type name="Key"/> <add-function signature="find(QPixmapCache::Key&)"> @@ -1274,7 +1232,6 @@ </add-function> </object-type> - <object-type name="QRegExpValidator"/> <object-type name="QRegularExpressionValidator"/> <object-type name="QStandardItem"> @@ -1454,10 +1411,7 @@ </object-type> <object-type name="QShowEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Show"/> <object-type name="QStatusTipEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::StatusTip"/> - <object-type name="QTabletEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::TabletMove || %1->type() == QEvent::TabletPress || %1->type() == QEvent::TabletRelease"> - <enum-type name="PointerType"/> - <enum-type name="TabletDevice"/> - </object-type> + <object-type name="QTabletEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::TabletMove || %1->type() == QEvent::TabletPress || %1->type() == QEvent::TabletRelease"/> <object-type name="QToolBarChangeEvent" polymorphic-id-expression="%1->type() == QEvent::ToolBarChange"/> <object-type name="QWhatsThisClickedEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::WhatsThisClicked"/> <object-type name="QWheelEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Wheel"/> @@ -1476,6 +1430,7 @@ <object-type name="QScrollEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::Scroll"> <enum-type name="ScrollState"/> </object-type> + <object-type name="QPointerEvent" copyable= "false" since="6.0"/> <object-type name="QScrollPrepareEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::ScrollPrepare"/> <object-type name="QTextFrame" > @@ -1892,14 +1847,6 @@ <insert-template name="qpainter_drawlist"/> </inject-code> </add-function> - <modify-function signature="drawRoundRect(int,int,int,int,int,int)"> - <modify-argument index="5"> - <rename to="xRound"/> - </modify-argument> - <modify-argument index="6"> - <rename to="yRound"/> - </modify-argument> - </modify-function> <modify-function signature="drawTiledPixmap(const QRect&,const QPixmap&,const QPoint&)"> <modify-argument index="3"> <rename to="pos"/> @@ -1915,16 +1862,6 @@ <no-null-pointer/> </modify-argument> </modify-function> - <modify-function signature="setRedirected(const QPaintDevice*,QPaintDevice*,const QPoint&)"> - <modify-argument index="1"> - <no-null-pointer/> - </modify-argument> - </modify-function> - <modify-function signature="restoreRedirected(const QPaintDevice*)"> - <modify-argument index="1"> - <no-null-pointer/> - </modify-argument> - </modify-function> <modify-function signature="drawText(QRectF,int,QString,QRectF*)"> <modify-argument index="4"> <remove-argument/> @@ -2258,6 +2195,7 @@ </value-type> <value-type name="QMatrix4x4" since="4.6"> + <enum-type name="Flag" flags="Flags" since="6.0"/> <!-- Qt5: HAIRY TRICK ALERT ahead! Qt5 partially replaced 'qreal' by float. @@ -2381,9 +2319,9 @@ </value-type> </object-type> - <object-type name="QTouchDevice"> - <enum-type name="CapabilityFlag" flags="Capabilities"/> - <enum-type name="DeviceType"/> + <object-type name="QInputDevice"> + <enum-type name="Capability" flags="Capabilities"/> + <enum-type name="DeviceType" flags="DeviceTypes"/> </object-type> <value-type name="QVector2D" since="4.6"> @@ -2527,7 +2465,7 @@ <enum-type name="Visibility"/> <modify-function signature="raise()" rename="raise_"/> <!-- see QWidget::nativeEvent(), QAbstractNativeEventFilter::nativeEventFilter() --> - <modify-function signature="nativeEvent(const QByteArray &,void*,long*)"> + <modify-function signature="nativeEvent(const QByteArray &,void*,qintptr*)"> <modify-argument index="3"> <remove-argument/> <conversion-rule class="native"> @@ -2578,29 +2516,10 @@ </object-type> - <object-type name="QOpenGLBuffer" since="5.0"> - <enum-type name="Access"/> - <enum-type name="RangeAccessFlag" flags="RangeAccessFlags"/> - <enum-type name="Type"/> - <enum-type name="UsagePattern"/> - </object-type> <object-type name="QOpenGLContext"> <enum-type name="OpenGLModuleType"/> </object-type> <object-type name="QOpenGLContextGroup" since="5.0"/> - <object-type name="QOpenGLDebugLogger" since="5.1"> - <enum-type name="LoggingMode"/> - </object-type> - <value-type name="QOpenGLDebugMessage" since="5.1"> - <enum-type name="Source" flags="Sources"/> - <enum-type name="Type" flags="Types"/> - <enum-type name="Severity" flags="Severities"/> - </value-type> - <object-type name="QOpenGLFramebufferObject" since="5.0"> - <enum-type name="Attachment"/> - <enum-type name="FramebufferRestorePolicy" since="5.7"/> - </object-type> - <value-type name="QOpenGLFramebufferObjectFormat"/> <!-- Compile error on Windows: QOpenGLPaintDevice::QOpenGLPaintDevice(const QOpenGLPaintDevice &)': attempting to reference a deleted function <object-type name="QOpenGLPaintDevice" since="5.0"/> --> @@ -2887,7 +2806,6 @@ <modify-argument index="2"><array/></modify-argument> </modify-function> </object-type> - <object-type name="QAbstractOpenGLFunctions" since="5.1"/> <!-- Classes are result of a macro expansion in src/gui/opengl/qopenglversionfunctions.h <object-type name="QOpenGLFunctions_1_0" since="5.1"/> <object-type name="QOpenGLFunctions_1_1" since="5.1"/> @@ -2917,98 +2835,6 @@ <object-type name="QOpenGLFunctions_4_5_Core" since="5.5"/> <object-type name="QOpenGLFunctions_ES2" since="5.1"/> --> - <value-type name="QOpenGLPixelTransferOptions"/> - <object-type name="QOpenGLShader" since="5.0"> - <enum-type name="ShaderTypeBit" flags="ShaderType"/> - </object-type> - <object-type name="QOpenGLShaderProgram" since="5.0"> - <modify-function signature="setAttributeArray(int,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setAttributeArray(const char*,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setAttributeArray(int,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setAttributeValue(int,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setAttributeValue(const char*,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setUniformValueArray(int,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setUniformValueArray(int,const int*,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setUniformValueArray(int,const unsigned int*,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setUniformValueArray(const char*,const float*,int,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setUniformValueArray(const char*,const int*,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <modify-function signature="setUniformValueArray(const char*,const unsigned int*,int)"> - <modify-argument index="2"><array/></modify-argument> - </modify-function> - <!-- Add explicit signatures for the setUniformValue functions --> - <modify-function signature="^setUniformValue\(const char\*,(float|int|uint)\)$" remove="all"/> - <!-- No need for a signature for GLuint, since Qt (internally) calls the same function: glUniform1i --> - <add-function signature="setUniformValue1f(const char*, float)" return-type="void"> - <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_float"/> - </add-function> - <add-function signature="setUniformValue1i(const char*, int)" return-type="void"> - <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_int"/> - </add-function> - <add-function signature="setUniformValue1f(int, float)" return-type="void"> - <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_float"/> - </add-function> - <add-function signature="setUniformValue1i(int, int)" return-type="void"> - <inject-code file="../glue/qtgui.cpp" snippet="qopenglshaderprogram_setuniformvalue_int"/> - </add-function> - </object-type> - <object-type name="QOpenGLTexture" since="5.2"> - <enum-type name="BindingTarget"/> - <enum-type name="CoordinateDirection"/> - <enum-type name="ComparisonFunction"/> - <enum-type name="ComparisonMode"/> - <enum-type name="CubeMapFace"/> - <enum-type name="DepthStencilMode"/> - <enum-type name="Feature" flags="Features"/> - <enum-type name="Filter"/> - <enum-type name="MipMapGeneration"/> - <enum-type name="PixelFormat"/> - <enum-type name="PixelType"/> - <enum-type name="SwizzleComponent"/> - <enum-type name="SwizzleValue"/> - <enum-type name="Target"/> - <enum-type name="TextureFormat"/> - <enum-type name="TextureFormatClass"/> - <enum-type name="TextureUnitReset"/> - <enum-type name="WrapMode"/> - <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"/> - </object-type> - <object-type name="QOpenGLTimeMonitor" since="5.1"/> - <object-type name="QOpenGLTimerQuery" since="5.1"/> - <object-type name="QOpenGLWindow" since="5.4"> - <enum-type name="UpdateBehavior"/> - </object-type> - <value-type name="QOpenGLVersionProfile" since="5.1"/> - <object-type name="QOpenGLVertexArrayObject"> - <object-type name="Binder"/> - </object-type> <value-type name="QPageLayout"> <enum-type name="Mode"/> <enum-type name="Orientation"/> @@ -3030,6 +2856,9 @@ <enum-type name="YUVLayout"/> </value-type> <object-type name="QPdfWriter"/> + <object-type name="QPointingDevice" since="6.0"> + <enum-type name="PointerType" flags="PointerTypes"/> + </object-type> <value-type name="QPointingDeviceUniqueId"/> <value-type name="QRawFont"> <enum-type name="AntialiasingType"/> @@ -3051,4 +2880,38 @@ </object-type> <object-type name="QStyleHints"/> + <object-type name="QUndoCommand"> + <modify-function signature="mergeWith(const QUndoCommand*)"> + <modify-argument index="1" invalidate-after-use="yes"/> + </modify-function> + </object-type> + <object-type name="QUndoGroup"> + <modify-function signature="addStack(QUndoStack*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="removeStack(QUndoStack*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QUndoStack"> + <modify-function signature="createUndoAction(QObject*,const QString&)const"> + <modify-argument index="return"> + <parent index="1" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="createRedoAction(QObject*,const QString&)const"> + <modify-argument index="return"> + <parent index="1" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="push(QUndoCommand*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> </typesystem> diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index 9557c4a26..fca44d92c 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -23,8 +23,6 @@ ${QtNetwork_GEN_DIR}/qlocalsocket_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkaccessmanager_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkaddressentry_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkcachemetadata_wrapper.cpp -${QtNetwork_GEN_DIR}/qnetworkconfiguration_wrapper.cpp -${QtNetwork_GEN_DIR}/qnetworkconfigurationmanager_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkcookie_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkcookiejar_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkdatagram_wrapper.cpp @@ -35,7 +33,6 @@ ${QtNetwork_GEN_DIR}/qnetworkproxyfactory_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkproxyquery_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkreply_wrapper.cpp ${QtNetwork_GEN_DIR}/qnetworkrequest_wrapper.cpp -${QtNetwork_GEN_DIR}/qnetworksession_wrapper.cpp ${QtNetwork_GEN_DIR}/qpassworddigestor_wrapper.cpp ${QtNetwork_GEN_DIR}/qssl_wrapper.cpp ${QtNetwork_GEN_DIR}/qsslcertificate_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index dc60a509d..f078b9bf7 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -42,6 +42,8 @@ <typesystem package="PySide2.QtNetwork"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <rejection class="dtlsopenssl"/> + <enum-type name="QDtlsError" since="5.12"/> <enum-type name="QOcspCertificateStatus" since="5.13"/> <enum-type name="QOcspRevocationReason" since="5.13"/> @@ -53,6 +55,8 @@ </namespace-type> <namespace-type name="QSsl"> + <enum-type name="AlertLevel" since="6.0"/> + <enum-type name="AlertType" since="6.0"/> <enum-type name="AlternativeNameEntryType"/> <enum-type name="EncodingFormat"/> <enum-type name="KeyAlgorithm"/> @@ -172,7 +176,6 @@ <enum-type name="LocalSocketState"/> </object-type> <object-type name="QNetworkAccessManager"> - <enum-type name="NetworkAccessibility" since="4.7"/> <enum-type name="Operation"/> <modify-function signature="createRequest(QNetworkAccessManager::Operation,const QNetworkRequest&,QIODevice*)"> <modify-argument index="3" invalidate-after-use="yes"/> @@ -262,21 +265,6 @@ <enum-type name="TransferTimeoutConstant" since="5.15"/> </value-type> - <value-type name="QNetworkConfiguration" since="4.7"> - <enum-type name="BearerType"/> - <enum-type name="Purpose" since="4.7"/> - <enum-type name="StateFlag" flags="StateFlags" since="4.7"/> - <enum-type name="Type" since="4.7"/> - </value-type> - <object-type name="QNetworkConfigurationManager" since="4.7"> - <enum-type name="Capability" flags="Capabilities" since="4.7"/> - </object-type> - <object-type name="QNetworkSession" since="4.7"> - <enum-type name="SessionError" since="4.7"/> - <enum-type name="State" since="4.7"/> - <enum-type name="UsagePolicy" flags="UsagePolicies"/> - </object-type> - <object-type name="QAbstractNetworkCache"/> <object-type name="QNetworkDiskCache"/> <value-type name="QNetworkCacheMetaData"/> diff --git a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp index efc86a048..5af6abb47 100644 --- a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp +++ b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.cpp @@ -132,7 +132,6 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, Q_ASSERT(metaObject); QQmlPrivate::RegisterType type; - type.version = 0; // Allow registering Qt Quick items. bool registered = false; @@ -153,8 +152,8 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, pyTypes[nextType] = pyObj; // FIXME: Fix this to assign new type ids each time. - type.typeId = qMetaTypeId<QObject *>(); - type.listId = qMetaTypeId<QQmlListProperty<QObject> >(); + type.typeId = QMetaType(QMetaType::QObjectStar); + type.listId = QMetaType::fromType<QQmlListProperty<QObject> >(); type.attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc<QObject>(); type.attachedPropertiesMetaObject = QQmlPrivate::attachedPropertiesMetaObject<QObject>(); @@ -170,8 +169,7 @@ int PySide::qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, type.objectSize = objectSize; type.create = createFuncs[nextType]; type.uri = uri; - type.versionMajor = versionMajor; - type.versionMinor = versionMinor; + type.version = QTypeRevision::fromVersion(versionMajor, versionMinor); type.elementName = qmlName; type.extensionObjectCreate = 0; @@ -367,18 +365,23 @@ QtQml_VolatileBoolObject_new(PyTypeObject *type, PyObject *args, PyObject *kwds) QtQml_VolatileBoolObject *self = reinterpret_cast<QtQml_VolatileBoolObject *>(type->tp_alloc(type, 0)); - if (self != Q_NULLPTR) - self->flag = ok; + if (self != nullptr) + self->flag = new AtomicBool(ok); return reinterpret_cast<PyObject *>(self); } +static void QtQml_VolatileBoolObject_dealloc(PyObject *self) +{ + auto volatileBool = reinterpret_cast<QtQml_VolatileBoolObject *>(self); + delete volatileBool->flag; + Sbk_object_dealloc(self); +} + static PyObject * QtQml_VolatileBoolObject_get(QtQml_VolatileBoolObject *self) { - if (self->flag) - return Py_True; - return Py_False; + return *self->flag ? Py_True : Py_False; } static PyObject * @@ -397,10 +400,7 @@ QtQml_VolatileBoolObject_set(QtQml_VolatileBoolObject *self, PyObject *args) return Q_NULLPTR; } - if (ok > 0) - self->flag = true; - else - self->flag = false; + *self->flag = ok > 0; Py_RETURN_NONE; } @@ -420,7 +420,7 @@ QtQml_VolatileBoolObject_repr(QtQml_VolatileBoolObject *self) { PyObject *s; - if (self->flag) + if (*self->flag) s = PyBytes_FromFormat("%s(True)", Py_TYPE(self)->tp_name); else @@ -435,12 +435,12 @@ QtQml_VolatileBoolObject_str(QtQml_VolatileBoolObject *self) { PyObject *s; - if (self->flag) + if (*self->flag) s = PyBytes_FromFormat("%s(True) -> %p", - Py_TYPE(self)->tp_name, &(self->flag)); + Py_TYPE(self)->tp_name, self->flag); else s = PyBytes_FromFormat("%s(False) -> %p", - Py_TYPE(self)->tp_name, &(self->flag)); + Py_TYPE(self)->tp_name, self->flag); Py_XINCREF(s); return s; } @@ -450,7 +450,7 @@ static PyType_Slot QtQml_VolatileBoolType_slots[] = { {Py_tp_str, (void *)reinterpret_cast<reprfunc>(QtQml_VolatileBoolObject_str)}, {Py_tp_methods, (void *)QtQml_VolatileBoolObject_methods}, {Py_tp_new, (void *)QtQml_VolatileBoolObject_new}, - {Py_tp_dealloc, (void *)Sbk_object_dealloc}, + {Py_tp_dealloc, (void *)QtQml_VolatileBoolObject_dealloc}, {0, 0} }; static PyType_Spec QtQml_VolatileBoolType_spec = { diff --git a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h index e94ea043f..74690d937 100644 --- a/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h +++ b/sources/pyside2/PySide2/QtQml/pysideqmlregistertype.h @@ -42,6 +42,8 @@ #include <sbkpython.h> +#include <atomic> + struct SbkObjectType; namespace PySide @@ -71,11 +73,13 @@ int qmlRegisterType(PyObject *pyObj, const char *uri, int versionMajor, int vers const char *qmlName); } -// Volatile Bool Ptr type definition. +// Volatile Bool Ptr type definition for QQmlIncubationController::incubateWhile(std::atomic<bool> *, int) + +using AtomicBool = std::atomic<bool>; typedef struct { PyObject_HEAD - volatile bool flag; + AtomicBool *flag; } QtQml_VolatileBoolObject; PyAPI_FUNC(PyTypeObject *) QtQml_VolatileBoolTypeF(void); diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml index b61b28c07..af6f75131 100644 --- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml +++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml @@ -54,9 +54,17 @@ in generator tests folder. --> </primitive-type> + <enum-type name="QQmlModuleImportSpecialVersions" since="6.0"/> + <!-- For qmlEngine(const QObject*), qmlContext(const QObject*) in qqml.h --> <namespace-type name="QtQml"/> + <!-- expose QQmlIncubationController::incubateWhile() (see + QtQml_VolatileBoolTypeF/pysideqmlregistertype.h) --> + <namespace-type name="std" generate="no"> + <value-type name="atomic" generate="no"/> + </namespace-type> + <add-function signature="qmlRegisterType(PyTypeObject,const char*,int,int,const char*)" return-type="int"> <inject-documentation format="target" mode="append"> This function registers the Python type in the QML system with the name qmlName, in the library imported from uri having the version number composed from versionMajor and versionMinor. @@ -93,6 +101,7 @@ <object-type name="QJSEngine"> <enum-type name="Extension" flags="Extensions" since="5.6"/> + <enum-type name="ObjectOwnership" since="6.0"/> <add-function signature="toScriptValue(const QVariant&)" return-type="QJSValue"> <inject-code class="target" position="end" file="../glue/qtqml.cpp" snippet="qjsengine-toscriptvalue"/> </add-function> @@ -116,7 +125,6 @@ <enum-type name="StartMode"/> </object-type> <object-type name="QQmlEngine"> - <enum-type name="ObjectOwnership"/> <modify-function signature="addImageProvider(const QString&,QQmlImageProviderBase*)"> <modify-argument index="2"> <define-ownership owner="c++"/> @@ -153,14 +161,14 @@ <enum-type name="Status"/> </object-type> <object-type name="QQmlIncubationController"> - <modify-function signature="incubateWhile(volatile bool*,int)" allow-thread="yes"> + <modify-function signature="incubateWhile(std::atomic<bool>*,int)" allow-thread="yes"> <modify-argument index="1"> - <!-- The replace type is needed to use the VolatileBool_Check macro instead of - a template conversion function with "volatile bool" as argument. --> + The replace type is needed to use the VolatileBool_Check macro instead of + a template conversion function with "volatile bool" as argument. <replace-type modified-type="VolatileBool"/> <conversion-rule class="native"> - volatile bool * %out = - &((reinterpret_cast<QtQml_VolatileBoolObject *>(%PYARG_1))->flag); + auto volatileBool = reinterpret_cast<QtQml_VolatileBoolObject *>(%PYARG_1); + std::atomic<bool> *%out = volatileBool->flag; </conversion-rule> </modify-argument> </modify-function> diff --git a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt index 0f453c90e..25f54679f 100644 --- a/sources/pyside2/PySide2/QtQuick/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtQuick/CMakeLists.txt @@ -3,10 +3,12 @@ project(QtQuick) set(QtQuick_registerType "${QtQuick_SOURCE_DIR}/pysidequickregistertype.cpp") set(QtQuick_SRC +${QtQuick_GEN_DIR}/qquickasyncimageprovider_wrapper.cpp ${QtQuick_GEN_DIR}/qquickframebufferobject_wrapper.cpp ${QtQuick_GEN_DIR}/qquickframebufferobject_renderer_wrapper.cpp ${QtQuick_GEN_DIR}/qquicktexturefactory_wrapper.cpp ${QtQuick_GEN_DIR}/qquickimageprovider_wrapper.cpp +${QtQuick_GEN_DIR}/qquickimageresponse_wrapper.cpp ${QtQuick_GEN_DIR}/qquicktransform_wrapper.cpp ${QtQuick_GEN_DIR}/qquickitem_wrapper.cpp ${QtQuick_GEN_DIR}/qquickitem_updatepaintnodedata_wrapper.cpp @@ -17,11 +19,9 @@ ${QtQuick_GEN_DIR}/qquickrendercontrol_wrapper.cpp ${QtQuick_GEN_DIR}/qquicktextdocument_wrapper.cpp ${QtQuick_GEN_DIR}/qquickview_wrapper.cpp ${QtQuick_GEN_DIR}/qquickwindow_wrapper.cpp -${QtQuick_GEN_DIR}/qsgabstractrenderer_wrapper.cpp ${QtQuick_GEN_DIR}/qsgbasicgeometrynode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgclipnode_wrapper.cpp ${QtQuick_GEN_DIR}/qsgdynamictexture_wrapper.cpp -${QtQuick_GEN_DIR}/qsgengine_wrapper.cpp #${QtQuick_GEN_DIR}/qsgflatcolormaterial_wrapper.cpp ${QtQuick_GEN_DIR}/qsggeometry_attribute_wrapper.cpp ${QtQuick_GEN_DIR}/qsggeometry_attributeset_wrapper.cpp @@ -51,13 +51,6 @@ ${QtQuick_GEN_DIR}/qsgtransformnode_wrapper.cpp ${QtQuick_GEN_DIR}/qtquick_module_wrapper.cpp ) -if (Qt${QT_MAJOR_VERSION}Quick_VERSION VERSION_GREATER 5.5.1) - set(QtQuick_SRC ${QtQuick_SRC} - ${QtQuick_GEN_DIR}/qquickasyncimageprovider_wrapper.cpp - ${QtQuick_GEN_DIR}/qquickimageresponse_wrapper.cpp - ) -endif() - set(QtQuick_include_dirs ${QtQuick_SOURCE_DIR} ${QtQml_SOURCE_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} diff --git a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp index a042ac2cc..f19dcdc03 100644 --- a/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp +++ b/sources/pyside2/PySide2/QtQuick/pysidequickregistertype.cpp @@ -117,6 +117,39 @@ bool pyTypeObjectInheritsFromClass(PyTypeObject *pyObjType, QByteArray className return isDerived; } +template <typename T> +struct QPysideQmlMetaTypeInterface : QtPrivate::QMetaTypeInterface +{ + const QByteArray name; + + QPysideQmlMetaTypeInterface(const QByteArray &name, const QMetaObject *metaObject = nullptr) + : QMetaTypeInterface { + /*.revision=*/ 0, + /*.size=*/ sizeof(T), + /*.alignment=*/ alignof(T), + /*.flags=*/ QtPrivate::QMetaTypeTypeFlags<T>::Flags, + /*.metaObject=*/ metaObject, + /*.name=*/ name.constData(), + /*.typeId=*/ 0, + /*.ref=*/ { Q_BASIC_ATOMIC_INITIALIZER(0) }, + /*.deleteSelf=*/ [](QMetaTypeInterface *self) { + delete static_cast<QPysideQmlMetaTypeInterface *>(self); + }, + /*.defaultCtr=*/ [](const QMetaTypeInterface *, void *addr) { new (addr) T(); }, + /*.copyCtr=*/ [](const QMetaTypeInterface *, void *addr, const void *other) { + new (addr) T(*reinterpret_cast<const T *>(other)); + }, + /*.moveCtr=*/ [](const QMetaTypeInterface *, void *addr, void *other) { + new (addr) T(std::move(*reinterpret_cast<T *>(other))); + }, + /*.dtor=*/ [](const QMetaTypeInterface *, void *addr) { + reinterpret_cast<T *>(addr)->~T(); + }, + /*.legacyRegisterOp=*/ nullptr + } + , name(name) {} +}; + template <class WrapperClass> void registerTypeIfInheritsFromClass( QByteArray className, @@ -129,40 +162,11 @@ void registerTypeIfInheritsFromClass( { bool shouldRegister = !registered && pyTypeObjectInheritsFromClass(typeToRegister, className); if (shouldRegister) { - int ptrType = - QMetaType::registerNormalizedType( - typePointerName.constData(), - QtMetaTypePrivate::QMetaTypeFunctionHelper<WrapperClass *>::Destruct, - QtMetaTypePrivate::QMetaTypeFunctionHelper<WrapperClass *>::Construct, - sizeof(WrapperClass *), - static_cast< ::QFlags<QMetaType::TypeFlag> >(QtPrivate::QMetaTypeTypeFlags< - WrapperClass *>::Flags), - typeMetaObject); - if (ptrType == -1) { - PyErr_Format(PyExc_TypeError, "Meta type registration of \"%s\" for QML usage failed.", - typePointerName.constData()); - return; - } - - int lstType = - QMetaType::registerNormalizedType( - typeListName.constData(), - QtMetaTypePrivate::QMetaTypeFunctionHelper<QQmlListProperty<WrapperClass> > - ::Destruct, - QtMetaTypePrivate::QMetaTypeFunctionHelper<QQmlListProperty<WrapperClass> > - ::Construct, - sizeof(QQmlListProperty<WrapperClass>), - static_cast< ::QFlags<QMetaType::TypeFlag> >( - QtPrivate::QMetaTypeTypeFlags<QQmlListProperty<WrapperClass> >::Flags), - nullptr); - if (lstType == -1) { - PyErr_Format(PyExc_TypeError, "Meta type registration of \"%s\" for QML usage failed.", - typeListName.constData()); - return; - } + QMetaType ptrType(new QPysideQmlMetaTypeInterface<WrapperClass *>(typePointerName, typeMetaObject)); + QMetaType lstType(new QPysideQmlMetaTypeInterface<QQmlListProperty<WrapperClass>>(typeListName)); - type->typeId = ptrType; - type->listId = lstType; + type->typeId = std::move(ptrType); + type->listId = std::move(lstType); type->attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc<WrapperClass>(); type->attachedPropertiesMetaObject = QQmlPrivate::attachedPropertiesMetaObject<WrapperClass>(); @@ -228,10 +232,8 @@ bool quickRegisterType(PyObject *pyObj, const char *uri, int versionMajor, int v return false; type->create = createFuncs[nextType]; - type->version = 0; type->uri = uri; - type->versionMajor = versionMajor; - type->versionMinor = versionMinor; + type->version = QTypeRevision::fromVersion(versionMajor, versionMinor); type->elementName = qmlName; type->metaObject = metaObject; diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml index 223eff773..31e05979b 100644 --- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml +++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml @@ -107,16 +107,9 @@ <enum-type name="TextRenderType" since="5.10"/> </object-type> - <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"/> <object-type name="QSGDynamicTexture"/> - <object-type name="QSGEngine"> - <enum-type name="CreateTextureOption" flags="CreateTextureOptions"/> - </object-type> <!-- <object-type name="QSGFlatColorMaterial"/> --> <object-type name="QSGGeometry"> <enum-type name="DataPattern"/> diff --git a/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in index 65daf1b84..da5534b82 100644 --- a/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in +++ b/sources/pyside2/PySide2/QtTest/QtTest_global.pre.h.in @@ -1,5 +1,5 @@ // QT_WIDGETS_LIB changes code generation in pysideqtesttouch.h -#if @Qt5Widgets_FOUND@ +#if @Qt6Widgets_FOUND@ # define QT_WIDGETS_LIB #endif diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index f7facaf7d..b22289149 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -89,14 +89,14 @@ The problem that costed my days of bug hunting is the fact that shiboken gives misleading error messages. The messages that I could not get rid of were - signature 'generateTouchEvent(QWidget*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: - signature 'generateTouchEvent(QWindow*,QTouchDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: + signature 'generateTouchEvent(QWidget*,QInputDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: + signature 'generateTouchEvent(QWindow*,QInputDevice*,bool)' for function modification in 'QTest' not found. Possible candidates: I always thought that for some reason the functions were not recognized, or the arguments somehow do not match their declaration. Only late in the project, I learnt that also a simply missing type name in the argument list leads to this message. - <object-type name="QTouchDevice"> + <object-type name="QInputDevice"> <enum-type name="CapabilityFlag" flags="Capabilities"/> <enum-type name="DeviceType"/> </object-type> @@ -151,12 +151,12 @@ </modify-argument> </modify-function> </object-type> - <modify-function signature="generateTouchEvent(QWidget*,QTouchDevice*,bool)" rename="touchEvent" since="4.6"> + <modify-function signature="generateTouchEvent(QWidget*,QInputDevice*,bool)" rename="touchEvent" since="4.6"> <modify-argument index="return"> <define-ownership class="target" owner="target"/> </modify-argument> </modify-function> - <modify-function signature="generateTouchEvent(QWindow*,QTouchDevice*,bool)" rename="touchEvent" since="4.6"> + <modify-function signature="generateTouchEvent(QWindow*,QInputDevice*,bool)" rename="touchEvent" since="4.6"> <modify-argument index="return"> <define-ownership class="target" owner="target"/> </modify-argument> diff --git a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt deleted file mode 100644 index 4220e46bf..000000000 --- a/sources/pyside2/PySide2/QtWebKit/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -project(QtWebKit) - -set(QtWebKit_SRC -${QtWebKit_GEN_DIR}/webcore_wrapper.cpp -# module is always needed -${QtWebKit_GEN_DIR}/qtwebkit_module_wrapper.cpp -) - -set(QtWebKit_include_dirs ${QtWebKit_SOURCE_DIR} - ${QtWebKit_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}WebKit_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ${QtGui_GEN_DIR} - ${QtWidgets_GEN_DIR} - ${QtNetwork_GEN_DIR} - ) -set(QtWebKit_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}WebKit_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ) -set(QtWebKit_deps QtGui QtNetwork) -create_pyside_module(NAME QtWebKit - INCLUDE_DIRS QtWebKit_include_dirs - LIBRARIES QtWebKit_libraries - DEPS QtWebKit_deps - TYPESYSTEM_PATH QtWebKit_SOURCE_DIR - SOURCES QtWebKit_SRC) - diff --git a/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml b/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml deleted file mode 100644 index e92417f26..000000000 --- a/sources/pyside2/PySide2/QtWebKit/typesystem_webkit.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ ---> -<typesystem package="PySide2.QtWebKit"> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> - - <namespace-type name="WebCore"/> - -</typesystem> diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt deleted file mode 100644 index 0bf660a62..000000000 --- a/sources/pyside2/PySide2/QtWebKitWidgets/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -project(QtWebKitWidgets) - -set(QtWebKitWidgets_SRC -${QtWebKitWidgets_GEN_DIR}/qgraphicswebview_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebdatabase_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebelement_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebelementcollection_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebframe_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhistory_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhistoryinterface_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhistoryitem_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebhittestresult_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebinspector_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_choosemultiplefilesextensionoption_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_choosemultiplefilesextensionreturn_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_errorpageextensionoption_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_errorpageextensionreturn_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_extensionoption_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_extensionreturn_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_viewportattributes_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpage_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpluginfactory_mimetype_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpluginfactory_plugin_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebpluginfactory_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebsecurityorigin_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebsettings_wrapper.cpp -${QtWebKitWidgets_GEN_DIR}/qwebview_wrapper.cpp -# module is always needed -${QtWebKitWidgets_GEN_DIR}/qtwebkitwidgets_module_wrapper.cpp -) - -set(QtWebKitWidgets_include_dirs - ${QtWebKitWidgets_SOURCE_DIR} - ${QtWebKitWidgets_BINARY_DIR} - ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}WebKit_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}PrintSupport_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}WebKitWidgets_INCLUDE_DIRS} - ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ${QtGui_GEN_DIR} - ${QtWidgets_GEN_DIR} - ${QtPrintSupport_GEN_DIR} - ${QtWebKit_GEN_DIR} - ${QtNetwork_GEN_DIR} - ) -set(QtWebKitWidgets_libraries pyside2 - ${Qt${QT_MAJOR_VERSION}WebKit_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}WebKitWidgets_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ) -set(QtWebKitWidgets_deps QtWidgets QtPrintSupport QtNetwork) -create_pyside_module(NAME QtWebKitWidgets - INCLUDE_DIRS QtWebKitWidgets_include_dirs - LIBRARIES QtWebKitWidgets_libraries - DEPS QtWebKitWidgets_deps - TYPESYSTEM_PATH QtWebKitWidgets_SOURCE_DIR - SOURCES QtWebKitWidgets_SRC) - diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml deleted file mode 100644 index 7760c1c3d..000000000 --- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml +++ /dev/null @@ -1,211 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/**************************************************************************** -** -** Copyright (C) 2016 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$ -** -****************************************************************************/ ---> -<typesystem package="PySide2.QtWebKitWidgets"> - <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> - <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> - <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> - <load-typesystem name="QtWebKit/typesystem_webkit.xml" generate="no"/> - <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> - <load-typesystem name="QtPrintSupport/typesystem_printsupport.xml" generate="no"/> - <load-typesystem name="templates/webkitwidgets_common.xml" generate="no"/> - - <value-type name="QWebDatabase"/> - - <object-type name="QWebPluginFactory"> - <enum-type name="Extension"/> - <value-type name="Plugin"/> - <value-type name="MimeType"/> - <modify-function signature="create(const QString &,const QUrl &,const QStringList &,const QStringList &)const"> - <modify-argument index="return"> - <define-ownership class="native" owner="c++"/> - <define-ownership class="target" owner="target"/> - </modify-argument> - </modify-function> - </object-type> - - <object-type name="QWebHistory"/> - <object-type name="QWebHistoryInterface"/> - <value-type name="QWebHistoryItem"/> - - <value-type name="QWebSecurityOrigin"> - <enum-type name="SubdomainSetting"/> - </value-type> - - <object-type name="QWebSettings"> - <enum-type name="FontFamily"/> - <enum-type name="FontSize"/> - <enum-type name="ThirdPartyCookiePolicy"/> - <enum-type name="WebAttribute"/> - <enum-type name="WebGraphic"/> - </object-type> - - <object-type name="QWebView"> - <modify-function signature="setPage(QWebPage*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> - <modify-function signature="page()const"> - <modify-argument index="return"> - <define-ownership class="target" owner="default"/> - </modify-argument> - <inject-code position="end" file="../glue/qtwebkitwidgets.cpp" snippet="qwebview-page"/> - </modify-function> - <modify-function signature="print(QPrinter*)const" rename="print_"/> - </object-type> - - <value-type name="QWebElement" since="4.6"> - <enum-type name="StyleResolveStrategy"/> - </value-type> - - <value-type name="QWebElementCollection" since="4.6"> - <add-function signature="__len__"> - <inject-code file="../glue/qtwebkitwidgets.cpp" snippet="qwebelementcollection-len"/> - </add-function> - <add-function signature="__getitem__"> - <inject-code file="../glue/qtwebkitwidgets.cpp" snippet="qwebelementcollection-getitem"/> - </add-function> - </value-type> - - <object-type name="QWebFrame"> - <enum-type name="RenderLayer" flags="RenderLayers" since="4.6"/> - <enum-type name="ValueOwnership"/> - <modify-function signature="addToJavaScriptWindowObject(QString,QObject*,QWebFrame::ValueOwnership)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="print(QPrinter*)const" rename="print_"/> - <modify-function signature="metaData()const"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <inject-code position="end" file="../glue/qtwebkitwidgets.cpp" snippet="qwebframe-metadata" /> - </modify-function> - </object-type> - - <object-type name="QWebPage"> - <enum-type name="ErrorDomain"/> - <enum-type name="Extension"/> - <enum-type name="Feature"/> - <enum-type name="FindFlag" flags="FindFlags"/> - <enum-type name="LinkDelegationPolicy"/> - <enum-type name="NavigationType"/> - <enum-type name="PermissionPolicy" since="4.8" revision="4800"/> - <enum-type name="VisibilityState"/> - <enum-type name="WebAction"/> - <enum-type name="WebWindowType"/> - - <value-type name="ChooseMultipleFilesExtensionOption"/> - <value-type name="ChooseMultipleFilesExtensionReturn"/> - <value-type name="ErrorPageExtensionOption" since="4.6"/> - <value-type name="ErrorPageExtensionReturn" since="4.6"/> - <value-type name="ExtensionOption"/> - <value-type name="ExtensionReturn"/> - <value-type name="ViewportAttributes"/> - - <modify-function signature="extension(QWebPage::Extension,const QWebPage::ExtensionOption*,QWebPage::ExtensionReturn*)"> - <modify-argument index="2" invalidate-after-use="yes"> - <conversion-rule class="target"> - <insert-template name="qwebpage_extension_argument_conversion"> - <replace from="$TYPE_SUFFIX" to="Option"/> - </insert-template> - </conversion-rule> - </modify-argument> - <modify-argument index="3" invalidate-after-use="yes"> - <conversion-rule class="target"> - <insert-template name="qwebpage_extension_argument_conversion"> - <replace from="$TYPE_SUFFIX" to="Return"/> - </insert-template> - </conversion-rule> - </modify-argument> - </modify-function> - - <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - </modify-function> - <modify-function signature="networkAccessManager()const"> - <modify-argument index="return"> - <reference-count action="set" variable-name="setNetworkAccessManager(QNetworkAccessManager*)1"/> - </modify-argument> - </modify-function> - <modify-function signature="view()const"> - <modify-argument index="return"> - <define-ownership owner="default"/> - </modify-argument> - </modify-function> - <modify-function signature="pluginFactory()const"> - <modify-argument index="return"> - <define-ownership owner="default"/> - </modify-argument> - </modify-function> - - <modify-function signature="javaScriptPrompt(QWebFrame*,const QString &,const QString &,QString*)"> - <modify-argument index="4"> - <remove-argument /> - <conversion-rule class="native"> - <insert-template name="qstring_remove"/> - </conversion-rule> - </modify-argument> - <modify-argument index="return"> - <replace-type modified-type="PySequence"/> - <conversion-rule class="native"> - <insert-template name="pysequence_qstring"/> - </conversion-rule> - <conversion-rule class="target"> - <insert-template name="qstring_pytuple"/> - </conversion-rule> - </modify-argument> - </modify-function> - - <add-function signature="qt_metacall()"> - <inject-code class="native" file="../glue/qtwebkitwidgets.cpp" snippet="qwebpage-qt-metacall"/> - </add-function> - </object-type> - - <value-type name="QWebHitTestResult"/> - - <object-type name="QGraphicsWebView" since="4.6"/> - <object-type name="QWebInspector" since="4.6"/> -</typesystem> diff --git a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt index 506a6fc78..5383d9410 100644 --- a/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWidgets/CMakeLists.txt @@ -9,8 +9,6 @@ ${QtWidgets_GEN_DIR}/qabstractitemview_wrapper.cpp ${QtWidgets_GEN_DIR}/qabstractscrollarea_wrapper.cpp ${QtWidgets_GEN_DIR}/qabstractslider_wrapper.cpp ${QtWidgets_GEN_DIR}/qabstractspinbox_wrapper.cpp -${QtWidgets_GEN_DIR}/qaction_wrapper.cpp -${QtWidgets_GEN_DIR}/qactiongroup_wrapper.cpp ${QtWidgets_GEN_DIR}/qapplication_wrapper.cpp ${QtWidgets_GEN_DIR}/qboxlayout_wrapper.cpp ${QtWidgets_GEN_DIR}/qbuttongroup_wrapper.cpp @@ -26,11 +24,9 @@ ${QtWidgets_GEN_DIR}/qcompleter_wrapper.cpp ${QtWidgets_GEN_DIR}/qdatawidgetmapper_wrapper.cpp ${QtWidgets_GEN_DIR}/qdateedit_wrapper.cpp ${QtWidgets_GEN_DIR}/qdatetimeedit_wrapper.cpp -${QtWidgets_GEN_DIR}/qdesktopwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qdial_wrapper.cpp ${QtWidgets_GEN_DIR}/qdialog_wrapper.cpp ${QtWidgets_GEN_DIR}/qdialogbuttonbox_wrapper.cpp -${QtWidgets_GEN_DIR}/qdirmodel_wrapper.cpp ${QtWidgets_GEN_DIR}/qdockwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qdoublespinbox_wrapper.cpp ${QtWidgets_GEN_DIR}/qerrormessage_wrapper.cpp @@ -109,7 +105,6 @@ ${QtWidgets_GEN_DIR}/qmenu_wrapper.cpp ${QtWidgets_GEN_DIR}/qmenubar_wrapper.cpp ${QtWidgets_GEN_DIR}/qmessagebox_wrapper.cpp ${QtWidgets_GEN_DIR}/qmouseeventtransition_wrapper.cpp -${QtWidgets_GEN_DIR}/qopenglwidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qpangesture_wrapper.cpp ${QtWidgets_GEN_DIR}/qpinchgesture_wrapper.cpp ${QtWidgets_GEN_DIR}/qplaintextdocumentlayout_wrapper.cpp @@ -124,7 +119,6 @@ ${QtWidgets_GEN_DIR}/qscrollarea_wrapper.cpp ${QtWidgets_GEN_DIR}/qscrollbar_wrapper.cpp ${QtWidgets_GEN_DIR}/qscroller_wrapper.cpp ${QtWidgets_GEN_DIR}/qscrollerproperties_wrapper.cpp -${QtWidgets_GEN_DIR}/qshortcut_wrapper.cpp ${QtWidgets_GEN_DIR}/qsizegrip_wrapper.cpp ${QtWidgets_GEN_DIR}/qsizepolicy_wrapper.cpp ${QtWidgets_GEN_DIR}/qslider_wrapper.cpp @@ -190,9 +184,6 @@ ${QtWidgets_GEN_DIR}/qtreeview_wrapper.cpp ${QtWidgets_GEN_DIR}/qtreewidget_wrapper.cpp ${QtWidgets_GEN_DIR}/qtreewidgetitem_wrapper.cpp ${QtWidgets_GEN_DIR}/qtreewidgetitemiterator_wrapper.cpp -${QtWidgets_GEN_DIR}/qundocommand_wrapper.cpp -${QtWidgets_GEN_DIR}/qundogroup_wrapper.cpp -${QtWidgets_GEN_DIR}/qundostack_wrapper.cpp ${QtWidgets_GEN_DIR}/qundoview_wrapper.cpp ${QtWidgets_GEN_DIR}/qvboxlayout_wrapper.cpp ${QtWidgets_GEN_DIR}/qwhatsthis_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index d2fc0705e..160082d07 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -235,7 +235,7 @@ <object-type name="QLayoutItem"> - <modify-function signature="widget()"> + <modify-function signature="widget()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -461,19 +461,6 @@ <enum-type name="SliderAction"/> <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"/> - </modify-argument> - </modify-function> - <modify-function signature="removeAction(QAction*)"> - <modify-argument index="1"> - <parent index="this" action="remove"/> - </modify-argument> - </modify-function> - </object-type> <object-type name="QCheckBox"/> <object-type name="QCommonStyle"> </object-type> @@ -525,14 +512,6 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QDirModel" polymorphic-id-expression="qobject_cast<QDirModel*>(%1)"> - <enum-type name="Roles"/> - <modify-function signature="setIconProvider(QFileIconProvider*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> <object-type name="QFileIconProvider"> <enum-type name="IconType"/> <enum-type name="Option" flags="Options"/> @@ -638,8 +617,6 @@ <object-type name="QItemDelegate"> <!-- ### "doLayout(...)" is an internal method. --> <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const" remove="all"/> - <!-- ### "selected(QPixmap,QPalette,bool)" is an internal method. --> - <modify-function signature="selected(QPixmap,QPalette,bool)const" remove="all"/> <!-- ### --> <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const"> <modify-argument index="1" invalidate-after-use="yes"/> @@ -963,15 +940,6 @@ </modify-function> </object-type> - <object-type name="QShortcut"> - <add-function signature="QShortcut(QKeySequence&,QWidget*,PyCallable*,Qt::ShortcutContext)"> - <modify-argument index="4"> - <replace-default-expression with="Qt::WindowShortcut"/> - </modify-argument> - <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qshortcut-1"/> - <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qshortcut-2"/> - </add-function> - </object-type> <object-type name="QSpacerItem"/> <object-type name="QStatusBar"> <modify-function signature="addWidget(QWidget*,int)"> @@ -1078,40 +1046,6 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QUndoCommand"> - <modify-function signature="mergeWith(const QUndoCommand*)"> - <modify-argument index="1" invalidate-after-use="yes"/> - </modify-function> - </object-type> - <object-type name="QUndoGroup"> - <modify-function signature="addStack(QUndoStack*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="removeStack(QUndoStack*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QUndoStack"> - <modify-function signature="createUndoAction(QObject*,const QString&)const"> - <modify-argument index="return"> - <parent index="1" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="createRedoAction(QObject*,const QString&)const"> - <modify-argument index="return"> - <parent index="1" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="push(QUndoCommand*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> <object-type name="QUndoView"> <modify-function signature="setGroup(QUndoGroup*)"> <modify-argument index="1"> @@ -1252,8 +1186,6 @@ <object-type name="QColorDialog"> <enum-type name="ColorDialogOption" flags="ColorDialogOptions"/> <modify-function signature="getColor(const QColor&,QWidget*,const QString&,QFlags<QColorDialog::ColorDialogOption>)" allow-thread="yes"/> - <!-- Qt5: obsolete --> - <modify-function signature="getRgba(unsigned int,bool*,QWidget*)" remove="all"/> </object-type> <object-type name="QLayout"> @@ -1562,16 +1494,6 @@ </inject-code> </modify-function> - <modify-function signature="getDouble(QWidget*,const QString&,const QString&,double,double,double,int,bool*,QFlags<Qt::WindowType>)" allow-thread="yes"> - <modify-argument index="8"> - <remove-default-expression/> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg"/> - </inject-code> - </modify-function> - <modify-function signature="getDouble(QWidget*,const QString&,const QString&,double,double,double,int,bool*,QFlags<Qt::WindowType>,double)" allow-thread="yes"> <modify-argument index="8"> <remove-default-expression/> @@ -2024,7 +1946,7 @@ <object-type name="QWidget" delete-in-main-thread="true"> <!-- see QWindow::nativeEvent(), QAbstractNativeEventFilter::nativeEventFilter() --> - <modify-function signature="nativeEvent(const QByteArray &,void*,long*)"> + <modify-function signature="nativeEvent(const QByteArray &,void*,qintptr*)"> <modify-argument index="3"> <remove-argument/> <conversion-rule class="native"> @@ -2225,33 +2147,6 @@ </modify-argument> </modify-function> - <modify-function signature="getContentsMargins(int*,int*,int*,int*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject"/> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="int"/> - </insert-template> - </inject-code> - <inject-code class="native" position="end"> - <insert-template name="fix_native_return_number*,number*,number*,number*"> - <replace from="$TYPE" to="int"/> - </insert-template> - </inject-code> - </modify-function> <modify-function signature="insertAction(QAction*,QAction*)"> <modify-argument index="2"> <parent index="this" action="add"/> @@ -2706,28 +2601,6 @@ </modify-argument> </modify-function> <modify-function signature="del()" rename="del_"/> - <modify-function signature="getTextMargins(int*,int*,int*,int*)const"> - <modify-argument index="0"> - <replace-type modified-type="PyObject*"/> - </modify-argument> - <modify-argument index="1"> - <remove-argument/> - </modify-argument> - <modify-argument index="2"> - <remove-argument/> - </modify-argument> - <modify-argument index="3"> - <remove-argument/> - </modify-argument> - <modify-argument index="4"> - <remove-argument/> - </modify-argument> - <inject-code class="target" position="beginning"> - <insert-template name="fix_number*,number*,number*,number*"> - <replace from="$TYPE" to="int"/> - </insert-template> - </inject-code> - </modify-function> <add-function signature="addAction(QAction*)"> <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qlineedit-addaction"/> @@ -2738,9 +2611,6 @@ <enum-type name="Mode"/> <enum-type name="SegmentStyle"/> </object-type> - <object-type name="QOpenGLWidget"> - <enum-type name="UpdateBehavior"/> - </object-type> <object-type name="QSplashScreen"> <!-- Override QWidget.painter --> <modify-function signature="repaint()" remove="all"/> @@ -2761,7 +2631,6 @@ </modify-argument> </modify-function> </object-type> - <object-type name="QDesktopWidget"/> <object-type name="QFrame"> <enum-type name="Shadow"/> <enum-type name="Shape"/> @@ -2782,7 +2651,7 @@ sys.exit(app.exec_()) </inject-documentation> </modify-function> - <modify-function signature="valueChanged(QString)"> + <modify-function signature="textChanged(QString)"> <inject-documentation mode="append" format="target"> :: @@ -2943,20 +2812,8 @@ </modify-function> <modify-function signature="print(QPagedPaintDevice*)const" rename="print_"/> </object-type> - <object-type name="QAction"> - <enum-type name="ActionEvent"/> - <enum-type name="MenuRole"/> - <enum-type name="Priority" since="4.6"/> - <modify-function signature="setMenu(QMenu*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="triggered(bool)" allow-thread="yes"/> - </object-type> <object-type name="QApplication"> - <enum-type name="ColorSpec"/> <extra-includes> <include file-name="QBasicTimer" location="global"/> <include file-name="QFont" location="global"/> diff --git a/sources/pyside2/PySide2/glue/qtcore.cpp b/sources/pyside2/PySide2/glue/qtcore.cpp index a0ca23662..6d8c0876d 100644 --- a/sources/pyside2/PySide2/glue/qtcore.cpp +++ b/sources/pyside2/PySide2/glue/qtcore.cpp @@ -647,8 +647,10 @@ if (%PYARG_0 == Py_None) // @snippet qline-hash namespace PySide { - template<> inline Py_ssize_t hash(const QLine &v) { - return qHash(qMakePair(qMakePair(v.x1(), v.y1()), qMakePair(v.x2(), v.y2()))); + template<> inline Py_ssize_t hash(const QLine &l) + { + const int v[4] = {l.x1(), l.y1(), l.x2(), l.y2()}; + return qHashRange(v, v + 4); } }; // @snippet qline-hash @@ -723,8 +725,9 @@ namespace PySide { // @snippet qrect namespace PySide { - template<> inline Py_ssize_t hash(const QRect &v) { - return qHash(qMakePair(qMakePair(v.x(), v.y()), qMakePair(v.width(), v.height()))); + template<> inline Py_ssize_t hash(const QRect &r) { + const int v[4] = {r.x(), r.y(), r.width(), r.height()}; + return qHashRange(v, v + 4); } }; // @snippet qrect @@ -801,11 +804,6 @@ static QObject *_findChildHelper(const QObject *parent, const QString &name, PyT return nullptr; } -static inline bool _findChildrenComparator(const QObject *&child, const QRegExp &name) -{ - return name.indexIn(child->objectName()) != -1; -} - static inline bool _findChildrenComparator(const QObject *&child, const QRegularExpression &name) { return name.match(child->objectName()).hasMatch(); diff --git a/sources/pyside2/PySide2/glue/qtgui.cpp b/sources/pyside2/PySide2/glue/qtgui.cpp index a6b45b7c0..2a139fe69 100644 --- a/sources/pyside2/PySide2/glue/qtgui.cpp +++ b/sources/pyside2/PySide2/glue/qtgui.cpp @@ -144,7 +144,7 @@ for (int i = 0, i_max = %CPPSELF.count(); i < i_max; ++i){ // @snippet qpixmap // @snippet qimage-constbits -%PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.byteCount()); +%PYARG_0 = Shiboken::Buffer::newObject(%CPPSELF.%FUNCTION_NAME(), %CPPSELF.sizeInBytes()); // @snippet qimage-constbits // @snippet qimage-bits diff --git a/sources/pyside2/PySide2/pysideqtesttouch.h b/sources/pyside2/PySide2/pysideqtesttouch.h index 115c7835e..7c08fbc02 100644 --- a/sources/pyside2/PySide2/pysideqtesttouch.h +++ b/sources/pyside2/PySide2/pysideqtesttouch.h @@ -142,12 +142,12 @@ namespace QTest private: #ifdef QT_WIDGETS_LIB - PySideQTouchEventSequence(QWidget *widget, QTouchDevice *aDevice, bool autoCommit) + PySideQTouchEventSequence(QWidget *widget, QInputDevice *aDevice, bool autoCommit) : targetWidget(widget), targetWindow(0), device(aDevice), commitWhenDestroyed(autoCommit) { } #endif - PySideQTouchEventSequence(QWindow *window, QTouchDevice *aDevice, bool autoCommit) + PySideQTouchEventSequence(QWindow *window, QInputDevice *aDevice, bool autoCommit) : #ifdef QT_WIDGETS_LIB targetWidget(0), @@ -195,18 +195,18 @@ private: QWidget *targetWidget; #endif QWindow *targetWindow; - QTouchDevice *device; + QInputDevice *device; bool commitWhenDestroyed; #ifdef QT_WIDGETS_LIB - friend PySideQTouchEventSequence *generateTouchEvent(QWidget *, QTouchDevice *, bool); + friend PySideQTouchEventSequence *generateTouchEvent(QWidget *, QInputDevice *, bool); #endif - friend PySideQTouchEventSequence *generateTouchEvent(QWindow *, QTouchDevice *, bool); + friend PySideQTouchEventSequence *generateTouchEvent(QWindow *, QInputDevice *, bool); }; #ifdef QT_WIDGETS_LIB inline PySideQTouchEventSequence *generateTouchEvent(QWidget *widget, - QTouchDevice *device, + QInputDevice *device, bool autoCommit = true) { return new PySideQTouchEventSequence(widget, device, autoCommit); @@ -214,7 +214,7 @@ private: #endif inline PySideQTouchEventSequence *generateTouchEvent(QWindow *window, - QTouchDevice *device, + QInputDevice *device, bool autoCommit = true) { return new PySideQTouchEventSequence(window, device, autoCommit); diff --git a/sources/pyside2/PySide2/templates/core_common.xml b/sources/pyside2/PySide2/templates/core_common.xml index 6d02428ad..b6fb72a2f 100644 --- a/sources/pyside2/PySide2/templates/core_common.xml +++ b/sources/pyside2/PySide2/templates/core_common.xml @@ -242,8 +242,8 @@ <!-- Helpers for modifying "bool nativeEventFilter(QByteArray, void*, long *result)" to return a tuple of bool,long --> <template name="return_native_eventfilter_conversion_variables"> - long resultVar{0}; - long *%out = &resultVar; + qintptr resultVar{0}; + qintptr *%out = &resultVar; </template> <template name="return_native_eventfilter_conversion"> %RETURN_TYPE %out = false; |