diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 143 |
1 files changed, 124 insertions, 19 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 470e253b1..e205213e6 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -104,6 +104,15 @@ <rejection class="QMetaObject" function-name="changeGuard"/> <rejection class="QMetaObject" function-name="removeGuard"/> + <rejection class="QAlgorithmsPrivate"/> + <rejection class="QJsonPrivate"/> + <rejection class="QTextStreamFunctions"/> + <rejection class="QtGlobalStatic"/> + <rejection class="QtMetaTypePrivate"/> + <rejection class="QtPrivate"/> + <rejection class="QtSharedPointer"/> + <rejection class="QtStringBuilder"/> + <rejection class="QByteArray" field-name="MaxSize"/> <rejection class="QChildEvent" field-name="c"/> <rejection class="QTimerEvent" field-name="id"/> @@ -223,9 +232,9 @@ </primitive-type> <primitive-type name="quintptr" target-lang-api-name="PyLong"> <conversion-rule> - <native-to-target file="../glue/qtcore.cpp" snippet="return-pylong-unsigned"/> + <native-to-target file="../glue/qtcore.cpp" snippet="return-pylong-quintptr"/> <target-to-native> - <add-conversion type="PyLong" file="../glue/qtcore.cpp" snippet="conversion-pylong-unsigned"/> + <add-conversion type="PyLong" file="../glue/qtcore.cpp" snippet="conversion-pylong-quintptr"/> </target-to-native> </conversion-rule> </primitive-type> @@ -656,6 +665,17 @@ </namespace-type> + <add-function signature="QEnum(PyObject*)" return-type="PyObject*"> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-qenum"/> + </add-function> + <add-function signature="QFlag(PyObject*)" return-type="PyObject*"> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-qflag"/> + </add-function> + + <add-function signature="__init_feature__()"> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-init-feature"/> + </add-function> + <add-function signature="qAbs(double)" return-type="double"> <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-qabs"/> </add-function> @@ -682,6 +702,10 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qt-installmessagehandler"/> </add-function> + <value-type name="QDeadlineTimer" since="5.8"> + <enum-type name="ForeverConstant"/> + </value-type> + <value-type name="QElapsedTimer" since="4.7"> <enum-type name="ClockType" since="4.7"/> </value-type> @@ -785,7 +809,7 @@ </modify-function> </object-type> - <value-type name="QBasicTimer"/> + <object-type name="QBasicTimer"/> <value-type name="QByteArrayMatcher"/> <value-type name="QCalendar" since="5.14"> <value-type name="YearMonthDay"/> @@ -1411,6 +1435,11 @@ </value-type> <object-type name="QLockFile"> <enum-type name="LockError"/> + <modify-function signature="isLocked()const" allow-thread="yes"/> + <modify-function signature="lock()" allow-thread="yes"/> + <modify-function signature="removeStaleLockFile()" allow-thread="yes"/> + <modify-function signature="tryLock(int)" allow-thread="yes"/> + <modify-function signature="unlock()" allow-thread="yes"/> </object-type> <object-type name="QMessageAuthenticationCode"/> <object-type name="QSignalBlocker"/> @@ -1451,14 +1480,22 @@ <enum-type name="IteratorFlag" flags="IteratorFlags"/> </object-type> <object-type name="QThread"> + <inject-code file="../glue/qtcore.cpp" class="native" position="beginning" snippet="qthread_pthread_cleanup"/> <enum-type name="Priority"/> <modify-function signature="currentThreadId()" remove="all"/> - <modify-function signature="run()" thread="yes"/> + <modify-function signature="run()" allow-thread="yes"> + <inject-code file="../glue/qtcore.cpp" class="native" position="beginning" + snippet="qthread_pthread_cleanup_install"/> + <inject-code file="../glue/qtcore.cpp" class="native" position="end" + snippet="qthread_pthread_cleanup_uninstall"/> + </modify-function> <modify-function signature="exec()" rename="exec_" allow-thread="yes"/> <modify-function signature="msleep(unsigned long)" allow-thread="yes"/> <modify-function signature="sleep(unsigned long)" allow-thread="yes"/> <modify-function signature="usleep(unsigned long)" allow-thread="yes"/> + <modify-function signature="wait(QDeadlineTimer)" allow-thread="yes"/> <modify-function signature="wait(unsigned long)" allow-thread="yes"/> + <modify-function signature="yieldCurrentThread()" allow-thread="yes"/> <modify-function signature="start(QThread::Priority)" allow-thread="yes"> <modify-argument index="1"> <rename to="priority"/> @@ -1514,6 +1551,11 @@ <define-ownership class="native" owner="c++"/> </modify-argument> </modify-function> + <modify-function signature="dataChanged(const QModelIndex&,const QModelIndex&,const QVector<int>&)" allow-thread="yes"/> + <modify-function signature="layoutAboutToBeChanged(const QList<QPersistentModelIndex>&,QAbstractItemModel::LayoutChangeHint)" allow-thread="yes"/> + <modify-function signature="layoutChanged(const QList<QPersistentModelIndex>&,QAbstractItemModel::LayoutChangeHint)" allow-thread="yes"/> + <modify-function signature="beginResetModel()" allow-thread="yes"/> + <modify-function signature="endResetModel()" allow-thread="yes"/> </object-type> <value-type name="QItemSelection"> <include file-name="QList" location="global"/> @@ -1526,7 +1568,7 @@ <enum-type name="SelectionFlag" flags="SelectionFlags"/> </object-type> - <value-type name="QItemSelectionRange" hash-function="qHash"> + <value-type name="QItemSelectionRange"> </value-type> <object-type name="QAbstractProxyModel" polymorphic-id-expression="qobject_cast<QAbstractProxyModel*>(%1)"> <extra-includes> @@ -1684,7 +1726,7 @@ <inject-documentation format="target" mode="append"> Like the method *findChild*, the first parameter should be the child's type. </inject-documentation> - <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchildren-1"/> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-findchildren"/> <modify-argument index="return"> <parent index="this" action="add"/> </modify-argument> @@ -1693,7 +1735,13 @@ </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-2"/> + <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"> <parent index="this" action="add"/> </modify-argument> @@ -1714,13 +1762,13 @@ <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qobject-receivers"/> </modify-function> - <modify-function signature="destroyed(QObject*)"> + <modify-function signature="destroyed(QObject*)" allow-thread="yes"> <modify-argument index="1"> <rename to="object"/> </modify-argument> </modify-function> - <modify-function signature="sender()const"> + <modify-function signature="sender()const" allow-thread="yes"> <modify-argument index="return"> <define-ownership owner="default"/> </modify-argument> @@ -1855,6 +1903,8 @@ </value-type> <value-type name="QByteArray" hash-function="qHash"> <enum-type name="Base64Option" flags="Base64Options" since="5.2"/> + <enum-type name="Base64DecodingStatus" since="5.15"/> + <value-type name="FromBase64Result" since="5.15"/> <conversion-rule> <target-to-native> <add-conversion type="Py_None" file="../glue/qtcore.cpp" snippet="conversion-pynone"/> @@ -2007,12 +2057,15 @@ <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. --> + <!-- 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(qulonglong,int)" remove="all"/> + <modify-function signature="number(uint,int)" remove="all"/> + <modify-function signature="number(qulonglong,int)" remove="all"/> <!--### --> @@ -2198,6 +2251,8 @@ <modify-function signature="flush()" allow-thread="yes"/> </object-type> <object-type name="QFile"> + <modify-function signature="open(QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes"/> + <modify-function signature="open(int,QFlags<QIODevice::OpenModeFlag>,QFlags<QFileDevice::FileHandleFlag>)" allow-thread="yes"/> <modify-function signature="copy(const QString&)" allow-thread="yes"/> <modify-function signature="copy(const QString&,const QString&)" allow-thread="yes"/> <modify-function signature="link(const QString&)" allow-thread="yes"/> @@ -2273,8 +2328,17 @@ </value-type> <object-type name="QLibraryInfo"> <enum-type name="LibraryLocation"/> + <modify-function signature="build()"> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="qlibraryinfo_build"/> + </modify-function> </object-type> <object-type name="QMutexLocker" copyable="no"> + <!-- PYSIDE-1271: Creating locking capable objects inside sections that + contain allow-thread, require the classes to also allow having threads. + The lack of the option here, was generating a deadlock when running a + QMutexLocker inside a QThread::run. + The reason of having this change is due to the new way of handling the GIL + in the Qt calls on the whole PySide2 module, that started on 5.14.2--> <modify-function signature="QMutexLocker(QBasicMutex*)" allow-thread="yes"> <modify-argument index="1"> <reference-count action="set" variable-name="mutex()const0"/> @@ -2305,12 +2369,12 @@ </object-type> <object-type name="QRecursiveMutex" since="5.14"/> <object-type name="QRandomGenerator" since="5.10"> - <modify-function signature="global()" rename="global_" allow-thread="yes"/> + <modify-function signature="global()" rename="global_"/> <modify-function signature="operator()()" remove="all"/> <modify-function signature="generate(quint32*,quint32*)" remove="all"/> </object-type> <object-type name="QRandomGenerator64" since="5.10"> - <modify-function signature="global()" rename="global_" allow-thread="yes"/> + <modify-function signature="global()" rename="global_"/> <modify-function signature="operator()()" remove="all"/> </object-type> <object-type name="QSemaphore"> @@ -2319,6 +2383,9 @@ </object-type> <object-type name="QSemaphoreReleaser" since="5.10"/> + <value-type name="QSocketDescriptor" since="5.15"> + <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="qsocketdescriptor"/> + </value-type> <object-type name="QSocketNotifier"> <enum-type name="Type"/> <add-function signature="QSocketNotifier(PyObject*, QSocketNotifier::Type, QObject*)"> @@ -2334,7 +2401,9 @@ <extra-includes> <!-- Qt5: private <include file-name="QAbstractFileEngine" location="global"/> --> </extra-includes> - <modify-function signature="createLocalFile(const QString&)" allow-thread="yes"/> + <modify-function signature="createNativeFile(QFile&)" allow-thread="yes"/> + <modify-function signature="createNativeFile(const QString&)" allow-thread="yes"/> + <modify-function signature="open()" allow-thread="yes"/> </object-type> <object-type name="QTemporaryDir"/> <object-type name="QMimeData"> @@ -2381,7 +2450,7 @@ <enum-type name="State"/> </object-type> <object-type name="QTranslator"> - <modify-function signature="load(const uchar*,int,QString)"> + <modify-function signature="load(const uchar*,int,QString)" allow-thread="yes"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> @@ -2392,7 +2461,9 @@ </modify-function> </object-type> <object-type name="QWaitCondition"> + <modify-function signature="wait(QMutex*,QDeadlineTimer)" allow-thread="yes"/> <modify-function signature="wait(QMutex*,unsigned long)" allow-thread="yes"/> + <modify-function signature="wait(QReadWriteLock*,QDeadlineTimer)" allow-thread="yes"/> <modify-function signature="wait(QReadWriteLock*,unsigned long)" allow-thread="yes"/> </object-type> <object-type name="QFileSystemWatcher"> @@ -2486,6 +2557,13 @@ <add-function signature="QCoreApplication()"> <inject-code file="../glue/qtcore.cpp" snippet="qcoreapplication-2"/> </add-function> + <!-- Addition for qApp. + To be fixed: This function deletes a little too much ATM that is missing later + when creating a new qApp. --> + <add-function signature="shutdown()"> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="moduleshutdown"/> + </add-function> + <!-- blocking functions --> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>,int)" allow-thread="yes"/> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> @@ -2767,16 +2845,23 @@ </object-type> <object-type name="QThreadPool"> - <modify-function signature="start(QRunnable*,int)"> + <modify-function signature="clear()" allow-thread="yes"/> + <modify-function signature="activeThreadCount()const" allow-thread="yes"/> + <modify-function signature="releaseThread()" allow-thread="yes"/> + <modify-function signature="reserveThread()" allow-thread="yes"/> + <modify-function signature="setMaxThreadCount(int)" allow-thread="yes"/> + <modify-function signature="waitForDone(int)" allow-thread="yes"/> + <modify-function signature="start(QRunnable*,int)" allow-thread="yes"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="tryStart(QRunnable*)"> + <modify-function signature="tryStart(QRunnable*)" allow-thread="yes"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> + <modify-function signature="tryTake(QRunnable*)" allow-thread="yes"/> <modify-function signature="globalInstance()" > <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="releaseownership"/> @@ -2822,6 +2907,21 @@ </modify-function> </value-type> + <object-type name="QFutureInterfaceBase"> + <enum-type name="State"/> + </object-type> + <value-type name="QFuture" generate="no"> + <include file-name="QtCore/qfuture.h" location="global"/> + <modify-function signature="waitForFinished()" allow-thread="yes"/> + </value-type> + <object-type name="QFutureWatcherBase" generate="no"> + <modify-function signature="futureInterface()" remove="all"/> + <modify-function signature="futureInterface() const" remove="all"/> + </object-type> + <object-type name="QFutureWatcher" generate="no"> + <include file-name="QtCore/qfuturewatcher.h" location="global"/> + </object-type> + <value-type name="QGenericArgument"> <include file-name="qobjectdefs.h" location="global"/> </value-type> @@ -2830,7 +2930,11 @@ <include file-name="qobjectdefs.h" location="global"/> </value-type> - <object-type name="QMessageLogContext"/> + <object-type name="QMessageLogContext" since="5.14"/> + + <object-type name="QMessageLogContext" since="5.9" until="5.13.2"> + <modify-function signature="copy(const QMessageLogContext &)" remove="all"/> + </object-type> <value-type name="QMetaMethod"> <enum-type name="Access"/> @@ -2847,6 +2951,7 @@ <object-type name="Connection"> <include file-name="qobjectdefs.h" location="global"/> </object-type> + <modify-function signature="^invokeMethod\(" allow-thread="yes"/> </object-type> <value-type name="QMetaProperty" > <!-- This isn't part of Qt public API --> @@ -2858,7 +2963,7 @@ </value-type> <value-type name="QMetaEnum"> - <modify-function signature="keyToValue(const char*,bool*)const" allow-thread="yes"> + <modify-function signature="keyToValue(const char*,bool*)const"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -2869,7 +2974,7 @@ <insert-template name="fix_args,bool*"/> </inject-code> </modify-function> - <modify-function signature="keysToValue(const char*,bool*)const" allow-thread="yes"> + <modify-function signature="keysToValue(const char*,bool*)const"> <modify-argument index="2"> <remove-argument /> </modify-argument> |