diff options
Diffstat (limited to 'sources/pyside2')
51 files changed, 1746 insertions, 495 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 41c62c67a..3e56881df 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -330,7 +330,7 @@ if(APPLE) endif() # Collect all optional modules. -set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Qml Quick QuickWidgets Script ScriptTools TextToSpeech Charts Svg DataVisualization) +set(ALL_OPTIONAL_MODULES Xml XmlPatterns Help Multimedia MultimediaWidgets OpenGL Positioning Location Qml Quick QuickWidgets Script ScriptTools Sensors TextToSpeech Charts Svg DataVisualization) find_package(Qt5UiTools) if(Qt5UiTools_FOUND) list(APPEND ALL_OPTIONAL_MODULES UiTools) @@ -340,7 +340,7 @@ endif() if(WIN32) list(APPEND ALL_OPTIONAL_MODULES AxContainer) endif() -list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineWidgets WebKit WebKitWidgets WebSockets) +list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineCore WebEngineWidgets WebKit WebKitWidgets WebSockets) if (Qt5Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endif() diff --git a/sources/pyside2/PySide2/CMakeLists.txt b/sources/pyside2/PySide2/CMakeLists.txt index 971d0a9ef..651bf2734 100644 --- a/sources/pyside2/PySide2/CMakeLists.txt +++ b/sources/pyside2/PySide2/CMakeLists.txt @@ -13,6 +13,25 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/_config.py.in" configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../pyside_version.py" "${CMAKE_CURRENT_BINARY_DIR}/_git_pyside_version.py" @ONLY) +# qt.conf needs to be placed next to QtWebEngineProcess so that the executable uses the correct +# Prefix location leading to an existing icu data file. It is needed on Windows, Linux, and macOS +# non-framework build. In framework build, instead of using qt.conf, Bundle querying is used. +if (WIN32 OR (UNIX AND NOT APPLE) OR (APPLE AND NOT QtCore_is_framework)) + + if (WIN32) + # On Windows, the QtWebEngineProcess is directly located in the Prefix, due to not using + # a "Qt" subfolder like on the other platforms. + set(QT_CONF_PREFIX ".") + else() + # On Linux and non-framework macOS, the QtWebEngineProcess is in ./libexec, so prefix is one + # level higher. + set(QT_CONF_PREFIX "..") + endif() + + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.in" + "${CMAKE_CURRENT_BINARY_DIR}/qt.conf" @ONLY) +endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/__init__.py" "${CMAKE_CURRENT_BINARY_DIR}/support/__init__.py" COPYONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/support/signature/__init__.py" diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 360cc3983..19975b1dc 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -69,7 +69,7 @@ <function signature="qIsNull(double)" /> <!-- Qt5: gone <function signature="qRound(qreal)" /> --> <function signature="qTan(qreal)" since="4.6" /> - <function signature="qtTrId(const char *, int)" since="4.6" /> + <function signature="qtTrId(const char*,int)" since="4.6" /> <function signature="qVersion()" /> <function signature="qrand()" /> <function signature="qsrand(uint)" /> @@ -895,7 +895,7 @@ <enum-type name="AlignmentFlag" flags="Alignment" /> <enum-type name="AnchorPoint" since="4.6" /> <enum-type name="ApplicationAttribute"/> - <enum-type name="ApplicationState" flags="ApplicationStates" since="5.1"/> + <enum-type name="ApplicationState" flags="ApplicationStates" since="5.1"/> <enum-type name="ArrowType"/> <enum-type name="AspectRatioMode"/> <enum-type name="Axis"/> @@ -979,9 +979,9 @@ <enum-type name="CursorMoveStyle" since="4.8" revision="4800"/> <!--### These functions are part of QtGui, not QtCore --> - <modify-function signature="codecForHtml(const QByteArray &)" remove="all"/> - <modify-function signature="mightBeRichText(const QString &)" remove="all"/> - <modify-function signature="convertFromPlainText(const QString &, Qt::WhiteSpaceMode)" remove="all"/> + <modify-function signature="codecForHtml(const QByteArray&)" remove="all"/> + <modify-function signature="mightBeRichText(const QString&)" remove="all"/> + <modify-function signature="convertFromPlainText(const QString&,Qt::WhiteSpaceMode)" remove="all"/> <!--### --> </namespace-type> @@ -1188,7 +1188,7 @@ </insert-template> </inject-code> </add-function> - <modify-function signature="intersect(QLineF, QPointF*)const"> + <modify-function signature="intersect(QLineF,QPointF*)const"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -1228,7 +1228,7 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </template> - <modify-function signature="unregisterResource(const uchar*, const QString&)" rename="unregisterResourceData"> + <modify-function signature="unregisterResource(const uchar*,const QString&)" rename="unregisterResourceData"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> @@ -1236,7 +1236,7 @@ <insert-template name="QResource_registerResource" /> </inject-code> </modify-function> - <modify-function signature="registerResource(const uchar*, const QString&)" rename="registerResourceData"> + <modify-function signature="registerResource(const uchar*,const QString&)" rename="registerResourceData"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> @@ -1377,7 +1377,7 @@ <include file-name="datetime.h" location="global"/> </extra-includes> <!-- Somewhat internal constructor used to pickle QDateTime --> - <add-function signature="QDateTime(int, int, int, int, int, int, int, int)"> + <add-function signature="QDateTime(int,int,int,int,int,int,int,int)"> <modify-argument index="8"> <replace-default-expression with="Qt::LocalTime"/> </modify-argument> @@ -1387,7 +1387,7 @@ %0 = new %TYPE(date, time, Qt::TimeSpec(%8)); </inject-code> </add-function> - <add-function signature="QDateTime(int, int, int, int, int, int)"> + <add-function signature="QDateTime(int,int,int,int,int,int)"> <inject-code class="target" position="beginning"> QDate date(%1, %2, %3); QTime time(%4, %5, %6); @@ -1777,7 +1777,7 @@ </modify-argument> </modify-function> </value-type> - + <value-type name="QTimeZone"> <enum-type name="TimeType"/> <enum-type name="NameType"/> @@ -1823,19 +1823,19 @@ <enum-type name="CurrencySymbolFormat" since="4.8" revision="4800"/> <enum-type name="QuotationStyle" since="4.8" revision="4800"/> <!--### All those C++ number types have the same representation in Python --> - <modify-function signature="toString(qulonglong) const" remove="all"/> - <modify-function signature="toString(ushort) const" remove="all"/> - <modify-function signature="toString(unsigned int) const" remove="all"/> + <modify-function signature="toString(qulonglong)const" remove="all"/> + <modify-function signature="toString(ushort)const" remove="all"/> + <modify-function signature="toString(unsigned int)const" remove="all"/> <!--### --> <extra-includes> <include file-name="QDate" location="global"/> </extra-includes> - <modify-function signature="toTime(QString, QLocale::FormatType)const"> + <modify-function signature="toTime(QString,QLocale::FormatType)const"> <modify-argument index="2"> <rename to="format" /> </modify-argument> </modify-function> - <modify-function signature="toDate(QString, QLocale::FormatType)const"> + <modify-function signature="toDate(QString,QLocale::FormatType)const"> <modify-argument index="2"> <rename to="format" /> </modify-argument> @@ -1992,7 +1992,7 @@ </modify-function> <modify-function signature="relock()" allow-thread="yes" /> <add-function signature="__enter__()" /> - <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)"> + <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)"> <inject-code> %CPPSELF.unlock(); </inject-code> @@ -2006,7 +2006,7 @@ </modify-function> <modify-function signature="relock()" allow-thread="yes" /> <add-function signature="__enter__()" /> - <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)"> + <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)"> <inject-code> %CPPSELF.unlock(); </inject-code> @@ -2035,14 +2035,14 @@ <enum-type name="CheckIndexOption" flags="CheckIndexOptions" class="yes" 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"/> - <!-- This function is the same as createIndex(int, int, int) const --> - <modify-function signature="createIndex(int, int, quintptr)const"> + <modify-function signature="createIndex(int,int,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"> <replace-default-expression with="0" /> </modify-argument> </modify-function> - <add-function signature="createIndex(int, int, PyObject*)const" return-type="QModelIndex"> + <add-function signature="createIndex(int,int,PyObject*)const" return-type="QModelIndex"> <modify-argument index="1"> <rename to="row"/> </modify-argument> @@ -2067,13 +2067,13 @@ <inject-code class="target" position="end"> qRegisterMetaType<QVector<int> >("QVector<int>"); </inject-code> - <modify-function signature="mimeData(QModelIndexList) const"> + <modify-function signature="mimeData(QModelIndexList)const"> <modify-argument index="return"> <define-ownership class="native" owner="c++"/> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="data(const QModelIndex&,int) const"> + <modify-function signature="data(const QModelIndex&,int)const"> <modify-argument index="return"> <define-ownership class="native" owner="c++"/> </modify-argument> @@ -2082,14 +2082,14 @@ <value-type name="QItemSelection"> <include file-name="QList" location="global"/> </value-type> - + <object-type name="QItemSelectionModel"> <extra-includes> <include file-name="QItemSelection" location="global"/> </extra-includes> <enum-type name="SelectionFlag" flags="SelectionFlags"/> </object-type> - + <value-type name="QItemSelectionRange" hash-function="qHash"> </value-type> <primitive-type name="QModelIndexList"/> @@ -2099,7 +2099,7 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="setSourceModel(QAbstractItemModel *)"> + <modify-function signature="setSourceModel(QAbstractItemModel*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -2114,7 +2114,7 @@ <include file-name="QStringList" location="global"/> <include file-name="QSize" location="global"/> </extra-includes> - <modify-function signature="setSourceModel(QAbstractItemModel *)"> + <modify-function signature="setSourceModel(QAbstractItemModel*)"> <modify-argument index="1"> <reference-count action="set"/> </modify-argument> @@ -2123,7 +2123,7 @@ <modify-function signature="clear()" remove="all"/> <modify-function signature="filterChanged()" remove="all"/> <!--### End of obsolete section --> - </object-type> + </object-type> <!-- QObject is created manually --> <object-type name="QObject"> <extra-includes> @@ -2131,7 +2131,7 @@ <include file-name="QCoreApplication" location="global"/> <include file-name="signalmanager.h" location="local" /> </extra-includes> - <modify-function signature="metaObject() const"> + <modify-function signature="metaObject()const"> <inject-code class="target" position="beginning"> %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); @@ -2163,7 +2163,7 @@ <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> <!-- End of Invalidate-after-use fix --> - <modify-function signature="parent() const"> + <modify-function signature="parent()const"> <modify-argument index="this"> <parent index="return" action="add"/> </modify-argument> @@ -2176,7 +2176,7 @@ <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="connect(const QObject*, const char*, const char *, Qt::ConnectionType) const"> + <modify-function signature="connect(const QObject*,const char*,const char*,Qt::ConnectionType)const"> <modify-argument index="4"> <rename to="type"/> </modify-argument> @@ -2187,7 +2187,7 @@ </inject-code> </modify-function> <!-- static version --> - <modify-function signature="connect(const QObject*, QMetaMethod, const QObject*, QMetaMethod, Qt::ConnectionType)"> + <modify-function signature="connect(const QObject*,QMetaMethod,const QObject*,QMetaMethod,Qt::ConnectionType)"> <modify-argument index="5"> <rename to="type"/> </modify-argument> @@ -2197,7 +2197,7 @@ %PYARG_0 = %CONVERTTOPYTHON[bool](%0); </inject-code> </modify-function> - <modify-function signature="connect(const QObject*, const char*, const QObject*, const char *, Qt::ConnectionType)"> + <modify-function signature="connect(const QObject*,const char*,const QObject*,const char*,Qt::ConnectionType)"> <modify-argument index="5"> <rename to="type"/> </modify-argument> @@ -2208,7 +2208,7 @@ </inject-code> </modify-function> <inject-code class="native" position="beginning" file="glue/qobject_connect.cpp" /> - <add-function signature="connect(const QObject*, const char*, PyCallable*, Qt::ConnectionType)" return-type="bool" static="yes"> + <add-function signature="connect(const QObject*,const char*,PyCallable*,Qt::ConnectionType)" return-type="bool" static="yes"> <modify-argument index="4"> <rename to="type"/> <replace-default-expression with="Qt::AutoConnection" /> @@ -2220,7 +2220,7 @@ </inject-code> </add-function> <!-- static version --> - <add-function signature="connect(const char*, PyCallable*, Qt::ConnectionType)" return-type="bool"> + <add-function signature="connect(const char*,PyCallable*,Qt::ConnectionType)" return-type="bool"> <modify-argument index="3"> <rename to="type"/> <replace-default-expression with="Qt::AutoConnection" /> @@ -2231,7 +2231,7 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> </add-function> - <add-function signature="connect(const char*, const QObject*, const char *, Qt::ConnectionType)" return-type="bool"> + <add-function signature="connect(const char*,const QObject*,const char*,Qt::ConnectionType)" return-type="bool"> <modify-argument index="4"> <rename to="type"/> <replace-default-expression with="Qt::AutoConnection" /> @@ -2242,21 +2242,21 @@ %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> </add-function> - - <add-function signature="emit(const char*, ...)" return-type="bool"> + + <add-function signature="emit(const char*,...)" return-type="bool"> <inject-code class="target" position="beginning"> %RETURN_TYPE %0 = PySide::SignalManager::instance().emitSignal(%CPPSELF, %1, %PYARG_2); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> </add-function> - <add-function signature="disconnect(const char *, PyCallable*)" return-type="bool"> + <add-function signature="disconnect(const char*,PyCallable*)" return-type="bool"> <inject-code class="target" position="beginning"> // %FUNCTION_NAME() - disable generation of function call. %RETURN_TYPE %0 = qobjectDisconnectCallback(%CPPSELF, %1, %2); %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> </add-function> - <add-function signature="disconnect(const QObject*, const char*, PyCallable*)" return-type="bool" static="yes"> + <add-function signature="disconnect(const QObject*,const char*,PyCallable*)" return-type="bool" static="yes"> <inject-code class="target" position="beginning"> // %FUNCTION_NAME() - disable generation of function call. %RETURN_TYPE %0 = qobjectDisconnectCallback(%1, %2, %3); @@ -2266,7 +2266,7 @@ <inject-code class="native" file="glue/qobject_findchild.cpp"/> - <add-function signature="findChild(PyTypeObject*, const QString&)" return-type="PyObject*"> + <add-function signature="findChild(PyTypeObject*,const QString&)" return-type="PyObject*"> <inject-code class="target" position="beginning"> QObject *child = _findChildHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1); %PYARG_0 = %CONVERTTOPYTHON[QObject*](child); @@ -2278,7 +2278,7 @@ <replace-default-expression with="QString()" /> </modify-argument> </add-function> - <add-function signature="findChildren(PyTypeObject*, const QString&)" return-type="PySequence*" > + <add-function signature="findChildren(PyTypeObject*,const QString&)" return-type="PySequence*" > <inject-code class="target" position="beginning"> %PYARG_0 = PyList_New(0); _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0); @@ -2290,7 +2290,7 @@ <replace-default-expression with="QString()" /> </modify-argument> </add-function> - <add-function signature="findChildren(PyTypeObject*, const QRegExp&)" return-type="PySequence*" > + <add-function signature="findChildren(PyTypeObject*,const QRegExp&)" return-type="PySequence*" > <inject-code class="target" position="beginning"> %PYARG_0 = PyList_New(0); _findChildrenHelper(%CPPSELF, %2, (PyTypeObject*)%PYARG_1, %PYARG_0); @@ -2300,7 +2300,7 @@ </modify-argument> </add-function> - <add-function signature="tr(const char *, const char *, int)" return-type="QString"> + <add-function signature="tr(const char*,const char*,int)" return-type="QString"> <modify-argument index="2"> <replace-default-expression with="0"/> </modify-argument> @@ -2326,7 +2326,7 @@ </inject-code> </add-function> - <modify-function signature="receivers(const char*) const"> + <modify-function signature="receivers(const char*)const"> <inject-code class="target" position="beginning"> // Avoid return +1 because SignalManager connect to "destroyed()" signal to control object timelife int ret = %CPPSELF.%FUNCTION_NAME(%1); @@ -2343,14 +2343,14 @@ </modify-argument> </modify-function> - <modify-function signature="sender() const"> + <modify-function signature="sender()const"> <modify-argument index="return"> <define-ownership owner="default"/> </modify-argument> </modify-function> <!-- This is not supported due the lack of information durring the call with no arguments, this can cause a memory leak --> - <modify-function signature="disconnect(const char*, const QObject *, const char *)const"> + <modify-function signature="disconnect(const char*,const QObject*,const char*)const"> <modify-argument index="1"> <remove-default-expression /> </modify-argument> @@ -2420,7 +2420,7 @@ </insert-template> </inject-code> </add-function> - <add-function signature="replace(QString, QString)" return-type="QString"> + <add-function signature="replace(QString,QString)" return-type="QString"> <modify-argument index="1"> <rename to="sourceString"/> </modify-argument> @@ -2532,7 +2532,7 @@ <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==(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" /> @@ -2564,7 +2564,7 @@ } </inject-code> </add-function> - <add-function signature="operator+(PyUnicode, QByteArray)"> + <add-function signature="operator+(PyUnicode,QByteArray)"> <inject-code> Shiboken::AutoDecRef str(PyUnicode_AsASCIIString(%PYARG_1)); if (!str.isNull()) { @@ -2574,7 +2574,7 @@ } </inject-code> </add-function> - <add-function signature="operator+(PyBytes, QByteArray)"> + <add-function signature="operator+(PyBytes,QByteArray)"> <inject-code> QByteArray ba = QByteArray(PyBytes_AS_STRING(%PYARG_1), PyBytes_GET_SIZE(%PYARG_1)) + *%CPPSELF; %PYARG_0 = %CONVERTTOPYTHON[QByteArray](ba); @@ -2606,7 +2606,7 @@ </insert-template> </inject-code> </add-function> - <modify-function signature="QByteArray(const char *, int)"> + <modify-function signature="QByteArray(const char*,int)"> <!-- Keep \x00 bytes passed in python strings --> <inject-code class="target" position="beginning"> if (PyBytes_Check(%PYARG_1)) { @@ -2666,8 +2666,8 @@ <!--### --> - <modify-function signature="operator const char *()const" remove="all"/> - <modify-function signature="operator const void *()const" remove="all"/> + <modify-function signature="operator const char*()const" remove="all"/> + <modify-function signature="operator const void*()const" remove="all"/> <!--### STL compatibility functions not supported by PySide --> <modify-function signature="push_back(char)" remove="all"/> @@ -2678,7 +2678,7 @@ <modify-function signature="push_front(const char*)" remove="all"/> <!--### --> - <modify-function signature="toLong(bool*, int) const"> + <modify-function signature="toLong(bool*,int)const"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -2686,7 +2686,7 @@ <insert-template name="fix_bool*,arg"/> </inject-code> </modify-function> - <modify-function signature="toLongLong(bool*, int) const"> + <modify-function signature="toLongLong(bool*,int)const"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -2694,7 +2694,7 @@ <insert-template name="fix_bool*,arg"/> </inject-code> </modify-function> - <modify-function signature="toShort(bool*, int) const"> + <modify-function signature="toShort(bool*,int)const"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -2702,7 +2702,7 @@ <insert-template name="fix_bool*,arg"/> </inject-code> </modify-function> - <modify-function signature="toUInt(bool*, int) const"> + <modify-function signature="toUInt(bool*,int)const"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -2710,7 +2710,7 @@ <insert-template name="fix_bool*,arg"/> </inject-code> </modify-function> - <modify-function signature="toULong(bool*, int) const"> + <modify-function signature="toULong(bool*,int)const"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -2718,7 +2718,7 @@ <insert-template name="fix_bool*,arg"/> </inject-code> </modify-function> - <modify-function signature="toULongLong(bool*, int) const"> + <modify-function signature="toULongLong(bool*,int)const"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -2831,7 +2831,7 @@ <enum-type name="ProcessEventsFlag" flags="ProcessEventsFlags"/> <modify-function signature="exec(QFlags<QEventLoop::ProcessEventsFlag>)" rename="exec_" allow-thread="yes" /> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes" /> - <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes" /> + <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>,int)" allow-thread="yes" /> </object-type> <object-type name="QFileDevice" since="5.0"> <enum-type name="FileError"/> @@ -2864,13 +2864,13 @@ </object-type> <object-type name="QFile"> <modify-function signature="copy(const QString&)" allow-thread="yes"/> - <modify-function signature="copy(const QString&, 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"/> - <modify-function signature="link(const QString&, const QString&)" allow-thread="yes"/> + <modify-function signature="link(const QString&,const QString&)" allow-thread="yes"/> <modify-function signature="remove()" allow-thread="yes"/> <modify-function signature="remove(const QString&)" allow-thread="yes"/> <modify-function signature="rename(const QString&)" allow-thread="yes"/> - <modify-function signature="rename(const QString&, const QString&)" allow-thread="yes"/> + <modify-function signature="rename(const QString&,const QString&)" allow-thread="yes"/> </object-type> <object-type name="QSaveFile"/> <object-type name="QFileSelector" /> @@ -2886,13 +2886,13 @@ <modify-function signature="waitForReadyRead(int)" allow-thread="yes"/> <modify-function signature="waitForBytesWritten(int)" allow-thread="yes"/> <!-- ### peek(qint64) do the job --> - <modify-function signature="peek(char*, qint64)" remove="all"/> + <modify-function signature="peek(char*,qint64)" remove="all"/> <!-- ### read(qint64) do the job --> - <modify-function signature="read(char*, qint64)" remove="all"/> + <modify-function signature="read(char*,qint64)" remove="all"/> <!-- ### readLine(qint64) do the job --> - <modify-function signature="readLine(char*, qint64)" remove="all"/> + <modify-function signature="readLine(char*,qint64)" remove="all"/> <!-- ### write(str) do the job --> - <modify-function signature="write(const char*, qint64)" remove="all"/> + <modify-function signature="write(const char*,qint64)" remove="all"/> <modify-function signature="write(const char*)" remove="all"/> <modify-function signature="getChar(char*)"> <modify-argument index="1"> @@ -2903,7 +2903,7 @@ <insert-template name="fix_char*" /> </inject-code> </modify-function> - <modify-function signature="readData(char*, qint64)"> + <modify-function signature="readData(char*,qint64)"> <inject-code class="target"> QByteArray ba; ba.resize(%2); @@ -2927,7 +2927,7 @@ </conversion-rule> </modify-argument> </modify-function> - <modify-function signature="readLineData(char*, qint64)"> + <modify-function signature="readLineData(char*,qint64)"> <inject-code class="target"> QByteArray ba; ba.resize(%2); @@ -2973,13 +2973,13 @@ </modify-argument> </modify-function> <modify-function signature="relock()" allow-thread="yes"/> - <modify-function signature="mutex() const"> + <modify-function signature="mutex()const"> <modify-argument index="return"> <reference-count action="set"/> </modify-argument> </modify-function> <add-function signature="__enter__()" /> - <add-function signature="__exit__(PyObject*, PyObject*, PyObject*)"> + <add-function signature="__exit__(PyObject*,PyObject*,PyObject*)"> <inject-code> %CPPSELF.unlock(); </inject-code> @@ -3006,13 +3006,13 @@ </object-type> <object-type name="QSemaphore"> <modify-function signature="acquire(int)" allow-thread="yes"/> - <modify-function signature="tryAcquire(int, int)" allow-thread="yes"/> + <modify-function signature="tryAcquire(int,int)" allow-thread="yes"/> </object-type> <object-type name="QSemaphoreReleaser" since="5.10"/> <object-type name="QSocketNotifier"> <enum-type name="Type"/> - <add-function signature="QSocketNotifier(PyObject*, QSocketNotifier::Type, QObject*)"> + <add-function signature="QSocketNotifier(PyObject*,QSocketNotifier::Type,QObject*)"> <modify-argument index="3"> <replace-default-expression with="0" /> <rename to="parent" /> @@ -3087,7 +3087,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)"> <modify-argument index="1"> <replace-type modified-type="PyBuffer" /> </modify-argument> @@ -3103,8 +3103,8 @@ </modify-function> </object-type> <object-type name="QWaitCondition"> - <modify-function signature="wait(QMutex*, unsigned long)" allow-thread="yes"/> - <modify-function signature="wait(QReadWriteLock*, unsigned long)" allow-thread="yes"/> + <modify-function signature="wait(QMutex*,unsigned long)" allow-thread="yes"/> + <modify-function signature="wait(QReadWriteLock*,unsigned long)" allow-thread="yes"/> </object-type> <object-type name="QFileSystemWatcher"> <extra-includes> @@ -3143,7 +3143,7 @@ timer->start(%1); </inject-code> </modify-function> - <add-function signature="singleShot(int, PyCallable*)" static="yes"> + <add-function signature="singleShot(int,PyCallable*)" static="yes"> <inject-code class="target" position="beginning"> // %FUNCTION_NAME() - disable generation of c++ function call Shiboken::AutoDecRef emptyTuple(PyTuple_New(0)); @@ -3154,7 +3154,7 @@ if (PyObject_TypeCheck(%2, &PySideSignalInstanceType)) { PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance*>(%2); - Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s", PySide::Signal::getSignature(signalInstance))); + Shiboken::AutoDecRef signalSignature(Shiboken::String::fromFormat("2%s",PySide::Signal::getSignature(signalInstance))); Shiboken::AutoDecRef result( PyObject_CallMethod(pyTimer, const_cast<char*>("connect"), @@ -3195,7 +3195,7 @@ <modify-function signature="waitForFinished(int)" allow-thread="yes"/> <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,QStringList)" allow-thread="yes"/> <modify-function signature="execute(QString)" allow-thread="yes"/> <modify-function signature="startDetached(QString,QStringList,QString,qint64*)"> <modify-argument index="4"> @@ -3213,7 +3213,7 @@ </inject-code> </modify-function> <!-- Function removed because on windows it returns a win32 specific structure --> - <modify-function signature="pid() const" remove="all" /> + <modify-function signature="pid()const" remove="all" /> <add-function signature="pid()" return-type="long"> <inject-code> long result; @@ -3269,11 +3269,11 @@ </inject-code> </add-function> <!-- blocking functions --> - <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>, int)" allow-thread="yes"/> + <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>,int)" allow-thread="yes"/> <modify-function signature="processEvents(QFlags<QEventLoop::ProcessEventsFlag>)" allow-thread="yes"/> <modify-function signature="flush()" allow-thread="yes"/> - <modify-function signature="sendEvent(QObject*, QEvent*)" allow-thread="yes"/> - <modify-function signature="sendPostedEvents(QObject*, int)" allow-thread="yes"/> + <modify-function signature="sendEvent(QObject*,QEvent*)" allow-thread="yes"/> + <modify-function signature="sendPostedEvents(QObject*,int)" allow-thread="yes"/> <modify-function signature="instance()"> <inject-code class="target"> QCoreApplication *app = QCoreApplication::instance(); @@ -3297,14 +3297,14 @@ <modify-function signature="notify(QObject*,QEvent*)" allow-thread="yes"> <modify-argument index="2" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="QCoreApplication(int &, char **, int)" access="private"/> + <modify-function signature="QCoreApplication(int &,char **,int)" access="private"/> <inject-code class="native" file="glue/qcoreapplication_init.cpp" position="beginning" /> - <modify-function signature="postEvent(QObject*,QEvent*, int)"> + <modify-function signature="postEvent(QObject*,QEvent*,int)"> <modify-argument index="2"> <define-ownership owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="winEventFilter(MSG*, long*)"> + <modify-function signature="winEventFilter(MSG*,long*)"> <modify-argument index="2"> <remove-argument /> <conversion-rule class="native"> @@ -3346,7 +3346,7 @@ <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="value(const QString&, const QVariant&)const"> + <modify-function signature="value(const QString&,const QVariant&)const"> <inject-documentation mode="append" format="target"> .. warning:: QSettings.value can return different types (QVariant types) depending on the platform it's running on, so the safest way to use it is always casting the result to the desired type, e.g.: int(settings.value("myKey")) </inject-documentation> @@ -3357,7 +3357,7 @@ </object-type> <object-type name="QChildEvent" polymorphic-id-expression="%1->type() == QEvent::ChildAdded || %1->type() == QEvent::ChildPolished || %1->type() == QEvent::ChildRemoved"> <modify-field name="c" read="false" write="false"/> - <modify-function signature="child() const"> + <modify-function signature="child()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -3632,7 +3632,7 @@ <!-- Qt5.5: Removed because it expect QString to be mutable --> <modify-function signature="readLineInto(QString*,qint64)" since="5.5" remove="all"/> <!-- Removed because we use the non-const version --> - <modify-function signature="QTextStream(const QByteArray&, QFlags<QIODevice::OpenModeFlag>)" remove="all"/> + <modify-function signature="QTextStream(const QByteArray&,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> <!-- Removed because it expect QString to be mutable --> <modify-function signature="setString(QString*,QFlags<QIODevice::OpenModeFlag>)" remove="all"/> @@ -3689,7 +3689,7 @@ </object-type> <object-type name="QThreadPool"> - <modify-function signature="start(QRunnable*, int)"> + <modify-function signature="start(QRunnable*,int)"> <modify-argument index="1"> <parent index="this" action="add" /> </modify-argument> @@ -3712,7 +3712,7 @@ <modify-function signature="pop_back()" remove="all"/> <modify-function signature="push_front(QXmlStreamAttribute)" remove="all"/> <modify-function signature="pop_front()" remove="all"/> - <modify-function signature="toList() const" remove="all"/> + <modify-function signature="toList()const" remove="all"/> <modify-function signature="fromList(const QList<QXmlStreamAttribute> &)" remove="all"/> <modify-function signature="operator+=(QVector<QXmlStreamAttribute>)" remove="all" /> </value-type> @@ -3726,7 +3726,7 @@ </object-type> <object-type name="QXmlStreamWriter"> <!-- Removed because it expect QString to be mutable --> - <modify-function signature="QXmlStreamWriter(QString *)" remove="all" /> + <modify-function signature="QXmlStreamWriter(QString*)" remove="all" /> <modify-function signature="codec()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> @@ -3757,19 +3757,19 @@ <object-type name="QMessageLogContext"> <modify-function signature="copy(const QMessageLogContext &)" remove="all" /> </object-type> - + <value-type name="QMetaMethod"> <enum-type name="Access"/> <enum-type name="MethodType"/> <!-- This isn't part of Qt public API --> <modify-function signature="attributes()const" remove="all" /> - <modify-function signature="getParameterTypes(int *) const" remove="all" /> + <modify-function signature="getParameterTypes(int*)const" remove="all" /> </value-type> <object-type name="QMetaObject"> <enum-type name="Call"/> <include file-name="qobjectdefs.h" location="global" /> <!-- This isn't part of Qt public API --> - <modify-function signature="connect(const QObject*, int, const QObject*, int, int, int*)" remove="all" /> + <modify-function signature="connect(const QObject*,int,const QObject*,int,int,int*)" remove="all" /> </object-type> <object-type name="QMetaObject::Connection"> <include file-name="qobjectdefs.h" location="global" /> @@ -3784,7 +3784,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" allow-thread="yes"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -3795,7 +3795,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" allow-thread="yes"> <modify-argument index="2"> <remove-argument /> </modify-argument> @@ -3821,7 +3821,7 @@ </object-type> <object-type name="QAbstractState" since="4.6"> - <modify-function signature="machine() const"> + <modify-function signature="machine()const"> <modify-argument index="this"> <parent index="return" action="add"/> </modify-argument> @@ -3855,13 +3855,13 @@ </modify-argument> </modify-function> - <modify-function signature="targetState() const"> + <modify-function signature="targetState()const"> <modify-argument index="return"> <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" /> </modify-argument> </modify-function> - <modify-function signature="targetStates() const"> + <modify-function signature="targetStates()const"> <modify-argument index="return"> <reference-count action="set" variable-name="setTargetState(QAbstractState*)1" /> </modify-argument> @@ -3882,7 +3882,7 @@ </modify-argument> </modify-function> - <modify-function signature="insertAnimation(int, QAbstractAnimation*)"> + <modify-function signature="insertAnimation(int,QAbstractAnimation*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -3973,7 +3973,7 @@ </modify-argument> </modify-function> - <modify-function signature="QEventTransition(QObject*, QEvent::Type, QState*)"> + <modify-function signature="QEventTransition(QObject*,QEvent::Type,QState*)"> <modify-argument index="3"> <parent index="this" action="add"/> </modify-argument> @@ -4022,7 +4022,7 @@ s1.addTransition(button.clicked, s1h)</code> <object-type name="QSequentialAnimationGroup" since="4.6"/> <object-type name="QSignalTransition" since="4.6"> - <add-function signature="QSignalTransition(PyObject*, QState*)" return-type="QSignalTransition*"> + <add-function signature="QSignalTransition(PyObject*,QState*)" return-type="QSignalTransition*"> <modify-argument index="2"> <replace-default-expression with="0" /> </modify-argument> @@ -4032,9 +4032,9 @@ s1.addTransition(button.clicked, s1h)</code> Shiboken::AutoDecRef obType(PyObject_Type(dataSource)); QObject* sender = %CONVERTTOCPP[QObject*](dataSource); if (sender) { - const char *dataSignature = PySide::Signal::getSignature((PySideSignalInstance*)%PYARG_1); + const char*dataSignature = PySide::Signal::getSignature((PySideSignalInstance*)%PYARG_1); QByteArray signature(dataSignature); // Append SIGNAL flag (2) - %0 = new QSignalTransitionWrapper(sender, "2" + signature, %2); + %0 = new QSignalTransitionWrapper(sender,"2" + signature,%2); } } </inject-code> @@ -4050,7 +4050,7 @@ s1.addTransition(button.clicked, s1h)</code> </modify-argument> </modify-function> - <modify-function signature="addTransition(const QObject*, const char*, QAbstractState*)"> + <modify-function signature="addTransition(const QObject*,const char*,QAbstractState*)"> <modify-argument index="return"> <parent index="this" action="add"/> </modify-argument> @@ -4074,7 +4074,7 @@ s1.addTransition(button.clicked, s1h)</code> <!-- FIXME: the proper signature for this added function would be something like addTransition(PySide2.QtCore.Signal, QAbstractState*) but that depends on bug #362. --> - <add-function signature="addTransition(PyObject*, QAbstractState*)" return-type="QSignalTransition*"> + <add-function signature="addTransition(PyObject*,QAbstractState*)" return-type="QSignalTransition*"> <modify-argument index="return"> <parent index="this" action="add"/> </modify-argument> @@ -4087,7 +4087,7 @@ s1.addTransition(button.clicked, s1h)</code> goto Sbk_%TYPEFunc_%FUNCTION_NAME_TypeError; PySideSignalInstance *signalInstance = reinterpret_cast<PySideSignalInstance*>(%1); QObject* sender = %CONVERTTOCPP[QObject*](PySide::Signal::getObject(signalInstance)); - QSignalTransition *%0 = %CPPSELF->%FUNCTION_NAME(sender, PySide::Signal::getSignature(signalInstance), %2); + QSignalTransition*%0 = %CPPSELF->%FUNCTION_NAME(sender,PySide::Signal::getSignature(signalInstance),%2); %PYARG_0 = %CONVERTTOPYTHON[QSignalTransition*](%0); </inject-code> </add-function> @@ -4106,12 +4106,12 @@ s1.addTransition(button.clicked, s1h)</code> <value-type name="SignalEvent" since="4.6"/> <value-type name="WrappedEvent" since="4.6"/> - <modify-function signature="addState(QAbstractState *)"> + <modify-function signature="addState(QAbstractState*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="removeState(QAbstractState *)"> + <modify-function signature="removeState(QAbstractState*)"> <modify-argument index="1"> <parent index="this" action="remove"/> </modify-argument> @@ -4129,7 +4129,7 @@ s1.addTransition(button.clicked, s1h)</code> </add-function> <!-- Replaced by a added function --> - <modify-function signature="defaultAnimations() const" remove="all"/> + <modify-function signature="defaultAnimations()const" remove="all"/> <add-function signature="defaultAnimations()" return-type="list of QAbstractAnimation" > <inject-code class="target" position="beginning"> %PYARG_0 = PyList_New(0); @@ -4156,13 +4156,13 @@ s1.addTransition(button.clicked, s1h)</code> <add-function signature="SIGNAL(const char*)" return-type="str"> <inject-code class="target" position="beginning"> - %PYARG_0 = Shiboken::String::fromFormat("2%s", QMetaObject::normalizedSignature(%1).constData()); + %PYARG_0 = Shiboken::String::fromFormat("2%s",QMetaObject::normalizedSignature(%1).constData()); </inject-code> </add-function> <add-function signature="SLOT(const char*)" return-type="str"> <inject-code class="target" position="beginning"> - %PYARG_0 = Shiboken::String::fromFormat("1%s", QMetaObject::normalizedSignature(%1).constData()); + %PYARG_0 = Shiboken::String::fromFormat("1%s",QMetaObject::normalizedSignature(%1).constData()); </inject-code> </add-function> @@ -4176,12 +4176,12 @@ s1.addTransition(button.clicked, s1h)</code> <insert-template name="return_argument"><replace from="#" to="1" /></insert-template> </inject-code> </add-function> - <add-function signature="QT_TRANSLATE_NOOP(PyObject, PyObject)" return-type="PyObject*"> + <add-function signature="QT_TRANSLATE_NOOP(PyObject,PyObject)" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="return_argument"><replace from="#" to="2" /></insert-template> </inject-code> </add-function> - <add-function signature="QT_TRANSLATE_NOOP3(PyObject, PyObject, PyObject)" return-type="PyObject*"> + <add-function signature="QT_TRANSLATE_NOOP3(PyObject,PyObject,PyObject)" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="return_argument"><replace from="#" to="2" /></insert-template> </inject-code> @@ -4205,7 +4205,7 @@ s1.addTransition(button.clicked, s1h)</code> const unsigned char *, const unsigned char *); </inject-code> - <add-function signature="qRegisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool"> + <add-function signature="qRegisterResourceData(int,PyBytes,PyBytes,PyBytes)" return-type="bool"> <inject-code class="target" position="beginning"> %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_2)), reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_3)), @@ -4213,7 +4213,7 @@ s1.addTransition(button.clicked, s1h)</code> %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); </inject-code> </add-function> - <add-function signature="qUnregisterResourceData(int, PyBytes, PyBytes, PyBytes)" return-type="bool"> + <add-function signature="qUnregisterResourceData(int,PyBytes,PyBytes,PyBytes)" return-type="bool"> <inject-code class="target" position="beginning"> %RETURN_TYPE %0 = %FUNCTION_NAME(%1, reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_2)), reinterpret_cast<uchar*>(PyBytes_AS_STRING(%PYARG_3)), @@ -4234,7 +4234,7 @@ s1.addTransition(button.clicked, s1h)</code> <suppress-warning text="visibility of function '*' modified in class '*'"/> <suppress-warning text="hiding of function '*' in class '*'"/> <suppress-warning text="namespace '*' does not have a type entry"/> - <suppress-warning text="Shadowing: QObject::parent() const and QAbstractItemModel::parent() const"/> + <suppress-warning text="Shadowing: QObject::parent()const and QAbstractItemModel::parent() const"/> <suppress-warning text="namespace '*' for enum 'QtMsgType' is not declared"/> <suppress-warning text="horribly broken type 'imaxdiv_t'"/> <suppress-warning text="horribly broken type '__off64_t'"/> @@ -4262,8 +4262,8 @@ s1.addTransition(button.clicked, s1h)</code> <suppress-warning text="signature 'winEventFilter(MSG*,long*)' for function modification in 'QCoreApplication' not found. Possible candidates:*"/> <!-- this is necessary to avoid warning on other modules --> - <suppress-warning text="signature 'operator*(QByteArray,const char*)' for function modification in 'QByteArray' not found. Possible candidates: *"/> - <suppress-warning text="signature 'operator+(QByteArray,QString)' for function modification in 'QByteArray' not found. Possible candidates: *"/> + <suppress-warning text="signature 'operator*(QByteArray,const char*)' for function modification in 'QByteArray' not found. Possible candidates:*"/> + <suppress-warning text="signature 'operator+(QByteArray,QString)' for function modification in 'QByteArray' not found. Possible candidates:*"/> <!-- This enum is intenaly used --> <suppress-warning text="enum 'PM_CbaIconHeight' does not have a type entry or is not an enum" /> diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 0c43fde1f..976380cda 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -275,7 +275,7 @@ <insert-template name="fix_bool*"/> </inject-code> </modify-function> - <add-function signature="quadToQuad(QPolygonF&, QPolygonF&)" return-type="PyObject*" static="true"> + <add-function signature="quadToQuad(QPolygonF&,QPolygonF&)" return-type="PyObject*" static="true"> <inject-code> QTransform _result; if (QTransform::quadToQuad(%1, %2, _result)) { @@ -407,7 +407,7 @@ </inject-code> </add-function> - <modify-function signature="operator[](uint) const" remove="all"/> + <modify-function signature="operator[](uint)const" remove="all"/> <add-function signature="__getitem__"> <inject-code class="target" position="beginning"> if (_i < 0 || _i >= %CPPSELF.count()) { @@ -423,12 +423,12 @@ <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*,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"/> <!-- See bug 759 --> - <modify-function signature="data() const"> + <modify-function signature="data()const"> <modify-argument index="return"> <replace-type modified-type="PyObject"/> </modify-argument> @@ -462,7 +462,7 @@ <modify-function signature="operator&=(QRect)" remove="all"/> <!-- ### --> </value-type> - + <value-type name="QTextBlock"> <value-type name="iterator" > <include file-name="QTextBlock" location="global"/> @@ -500,7 +500,7 @@ } </inject-code> </modify-function> - <modify-function signature="userData() const"> + <modify-function signature="userData()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -555,7 +555,7 @@ </add-function> <!-- ### "QPolygon(int, const int*)" is an internal constructor. --> - <modify-function signature="QPolygon(int, const int *)" remove="all"/> + <modify-function signature="QPolygon(int,const int*)" remove="all"/> <!-- ### A QVector parameter, for no defined type, will generate wrong code. --> <modify-function signature="operator+=(QVector<QPoint>)" remove="all"/> <modify-function signature="operator<<(QPoint)"> @@ -590,7 +590,7 @@ <value-type name="QIcon" > <enum-type name="Mode"/> <enum-type name="State"/> - <modify-function signature="QIcon(QIconEngine *)"> + <modify-function signature="QIcon(QIconEngine*)"> <modify-argument index="1"> <no-null-pointer/> <parent index="this" action="add"/> @@ -646,7 +646,7 @@ <!-- ### Operator ! doesn't make sense in Python. --> <modify-function signature="operator!()const" remove="all"/> - + <modify-function signature="loadFromData(const uchar*,uint,const char*,QFlags<Qt::ImageConversionFlag>)"> <modify-argument index="1"> <replace-type modified-type="PyBytes"/> @@ -713,7 +713,7 @@ </modify-argument> </modify-function> </value-type> - + <!-- Qt5: this _should_ be obsolete, but QImage is still using it... --> <value-type name="QMatrix"> <extra-includes> @@ -794,7 +794,7 @@ <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> - <modify-function signature="setStyleHint(QFont::StyleHint, QFont::StyleStrategy)"> + <modify-function signature="setStyleHint(QFont::StyleHint,QFont::StyleStrategy)"> <modify-argument index="2"> <rename to="strategy"/> </modify-argument> @@ -823,7 +823,7 @@ uchar *ptr = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_1)); %0 = new %TYPE(ptr, %ARGS); </template> - <modify-function signature="QImage(uchar *,int,int,int,QImage::Format,QImageCleanupFunction, void *)"> + <modify-function signature="QImage(uchar*,int,int,int,QImage::Format,QImageCleanupFunction,void*)"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> @@ -833,7 +833,7 @@ </insert-template> </inject-code> </modify-function> - <modify-function signature="QImage(uchar*,int,int,QImage::Format,QImageCleanupFunction, void *)"> + <modify-function signature="QImage(uchar*,int,int,QImage::Format,QImageCleanupFunction,void*)"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> @@ -860,8 +860,8 @@ </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,QImage::Format,QImageCleanupFunction, void *)" remove="all" /> + <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format,QImageCleanupFunction,void*)" remove="all"/> + <modify-function signature="QImage(const uchar*,int,int,QImage::Format,QImageCleanupFunction,void*)" remove="all" /> <!-- ### --> <modify-function signature="QImage(const char*[])"> @@ -1575,44 +1575,44 @@ <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="appendColumn(const QList<QStandardItem *> &)"> + <modify-function signature="appendColumn(const QList<QStandardItem*> &)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="appendRow(const QList<QStandardItem *> &)"> + <modify-function signature="appendRow(const QList<QStandardItem*> &)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="appendRow(QStandardItem *)"> + <modify-function signature="appendRow(QStandardItem*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="appendRows(const QList<QStandardItem *> &)"> + <modify-function signature="appendRows(const QList<QStandardItem*> &)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertColumn(int, const QList<QStandardItem *> &)"> + <modify-function signature="insertColumn(int,const QList<QStandardItem*> &)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertRow(int, const QList<QStandardItem *> &)"> + <modify-function signature="insertRow(int,const QList<QStandardItem*> &)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertRows(int, const QList<QStandardItem *> &)"> + <modify-function signature="insertRows(int,const QList<QStandardItem*> &)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setChild(int, int, QStandardItem *)"> + <modify-function signature="setChild(int,int,QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child QStandardItem *_i = %CPPSELF->child(%1, %2); @@ -1625,7 +1625,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setChild(int, QStandardItem *)"> + <modify-function signature="setChild(int,QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child QStandardItem *_i = %CPPSELF->child(%1); @@ -1639,13 +1639,13 @@ </modify-argument> </modify-function> - <modify-function signature="takeChild(int, int)"> + <modify-function signature="takeChild(int,int)"> <modify-argument index="return"> <parent index="this" action="remove"/> </modify-argument> </modify-function> - <modify-function signature="clone() const"> + <modify-function signature="clone()const"> <modify-argument index="return"> <define-ownership class="native" owner="c++"/> <define-ownership class="target" owner="target"/> @@ -1666,7 +1666,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="document() const"> + <modify-function signature="document()const"> <modify-argument index="this"> <parent index="return" action="add"/> </modify-argument> @@ -1737,7 +1737,7 @@ <insert-template name="return_QString"/> </inject-code> </modify-function> - <modify-function signature="validate(QString &, int &)const"> + <modify-function signature="validate(QString &,int &)const"> <modify-argument index="return"> <replace-type modified-type="PyObject"/> <conversion-rule class="native"> @@ -1759,7 +1759,7 @@ <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1->type() == QEvent::DragLeave"/> <object-type name="QDragMoveEvent" polymorphic-id-expression="%1->type() == QEvent::DragMove" /> <object-type name="QDropEvent" polymorphic-id-expression="%1->type() == QEvent::Drop"> - <modify-function signature="source() const"> + <modify-function signature="source()const"> <modify-argument index="return"> <define-ownership class="target" owner="default" /> </modify-argument> @@ -1911,12 +1911,12 @@ <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="source() const"> + <modify-function signature="source()const"> <modify-argument index="return"> <define-ownership owner="target"/> </modify-argument> </modify-function> - <modify-function signature="target() const"> + <modify-function signature="target()const"> <modify-argument index="return"> <define-ownership owner="target"/> </modify-argument> @@ -1928,7 +1928,7 @@ </modify-argument> </modify-function> <modify-function signature="exec(QFlags<Qt::DropAction>)" rename="exec_" allow-thread="yes"/> - <modify-function signature="exec(QFlags<Qt::DropAction>, Qt::DropAction)" rename="exec_" allow-thread="yes"/> + <modify-function signature="exec(QFlags<Qt::DropAction>,Qt::DropAction)" rename="exec_" allow-thread="yes"/> </object-type> <object-type name="QStandardItemModel" polymorphic-id-expression="qobject_cast<QStandardItemModel*>(%1)"> @@ -1951,32 +1951,32 @@ <parent index="this" action="remove" /> </modify-argument> </modify-function> - <modify-function signature="verticalHeaderItem(int) const"> + <modify-function signature="verticalHeaderItem(int)const"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="horizontalHeaderItem(int) const"> + <modify-function signature="horizontalHeaderItem(int)const"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="invisibleRootItem() const"> + <modify-function signature="invisibleRootItem()const"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="item(int, int) const"> + <modify-function signature="item(int,int)const"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="itemFromIndex(const QModelIndex&) const"> + <modify-function signature="itemFromIndex(const QModelIndex&)const"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="itemPrototype() const"> + <modify-function signature="itemPrototype()const"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> @@ -1993,18 +1993,18 @@ </modify-argument> </modify-function> - <modify-function signature="insertRow(int, QStandardItem*)"> + <modify-function signature="insertRow(int,QStandardItem*)"> <modify-argument index="2"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="setHorizontalHeaderItem(int, QStandardItem*)"> + <modify-function signature="setHorizontalHeaderItem(int,QStandardItem*)"> <modify-argument index="2"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="setItem(int, int, QStandardItem*)"> + <modify-function signature="setItem(int,int,QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child QStandardItem *_i = %CPPSELF->item(%1, %2); @@ -2017,7 +2017,7 @@ <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="setItem(int, QStandardItem*)"> + <modify-function signature="setItem(int,QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child QStandardItem *_i = %CPPSELF->item(%1); @@ -2036,7 +2036,7 @@ </modify-argument> </modify-function> - <modify-function signature="setVerticalHeaderItem(int, QStandardItem*)"> + <modify-function signature="setVerticalHeaderItem(int,QStandardItem*)"> <inject-code class="target" position="beginning"> // Clear parent from the old child QStandardItem *_i = %CPPSELF->verticalHeaderItem(%1); @@ -2062,19 +2062,19 @@ </modify-argument> </modify-function> - <modify-function signature="findItems(const QString&, QFlags<Qt::MatchFlag>, int) const"> + <modify-function signature="findItems(const QString&,QFlags<Qt::MatchFlag>,int)const"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="insertColumn(int, const QList<QStandardItem*>&)"> + <modify-function signature="insertColumn(int,const QList<QStandardItem*>&)"> <modify-argument index="2"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="insertRow(int, const QList<QStandardItem*>&)"> + <modify-function signature="insertRow(int,const QList<QStandardItem*>&)"> <modify-argument index="2"> <parent index="this" action="add" /> </modify-argument> @@ -2110,7 +2110,7 @@ <include file-name="QPixmap" location="global"/> </extra-includes> <enum-type name="Mode" /> - <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)"> + <modify-function signature="setMimeData(QMimeData*,QClipboard::Mode)"> <modify-argument index="1"> <!-- TODO: maybe this is not the best solution --> <parent index="this" action="add"/> @@ -2219,7 +2219,7 @@ </value-type> <!-- ### "drawText(...)" is an internal method. --> - <modify-function signature="drawText(const QPointF&, const QString&, int, int)" remove="all"/> + <modify-function signature="drawText(const QPointF&,const QString&,int,int)" remove="all"/> <template name="qpainter_drawlist"> %BEGIN_ALLOW_THREADS @@ -2227,67 +2227,67 @@ %END_ALLOW_THREADS </template> - <modify-function signature="drawConvexPolygon(const QPoint*, int)" remove="all" /> + <modify-function signature="drawConvexPolygon(const QPoint*,int)" remove="all" /> <add-function signature="drawConvexPolygon(QVector<QPoint>)"> <inject-code> <insert-template name="qpainter_drawlist" /> </inject-code> </add-function> - <modify-function signature="drawConvexPolygon(const QPointF*, int)" remove="all" /> + <modify-function signature="drawConvexPolygon(const QPointF*,int)" remove="all" /> <add-function signature="drawConvexPolygon(QVector<QPointF>)"> <inject-code> <insert-template name="qpainter_drawlist" /> </inject-code> </add-function> <!-- ### Overloads using QVector<T> does the job of these methods --> - <modify-function signature="drawLines(const QLine*, int)" remove="all" /> - <modify-function signature="drawLines(const QLineF*, int)" remove="all" /> - <modify-function signature="drawLines(const QPoint*, int)" remove="all" /> - <modify-function signature="drawLines(const QPointF*, int)" remove="all" /> - <modify-function signature="drawRects(const QRect*, int)" remove="all" /> - <modify-function signature="drawRects(const QRectF*, int)" remove="all" /> + <modify-function signature="drawLines(const QLine*,int)" remove="all" /> + <modify-function signature="drawLines(const QLineF*,int)" remove="all" /> + <modify-function signature="drawLines(const QPoint*,int)" remove="all" /> + <modify-function signature="drawLines(const QPointF*,int)" remove="all" /> + <modify-function signature="drawRects(const QRect*,int)" remove="all" /> + <modify-function signature="drawRects(const QRectF*,int)" remove="all" /> <!-- ### --> - <modify-function signature="drawPoints(const QPoint*, int)" remove="all" /> + <modify-function signature="drawPoints(const QPoint*,int)" remove="all" /> <add-function signature="drawPoints(QVector<QPoint>)"> <inject-code> <insert-template name="qpainter_drawlist" /> </inject-code> </add-function> - <modify-function signature="drawPoints(const QPointF*, int)" remove="all" /> + <modify-function signature="drawPoints(const QPointF*,int)" remove="all" /> <add-function signature="drawPoints(QVector<QPointF>)"> <inject-code> <insert-template name="qpainter_drawlist" /> </inject-code> </add-function> - <modify-function signature="drawPolygon(const QPoint*, int, Qt::FillRule)" remove="all" /> - <add-function signature="drawPolygon(QVector<QPoint>, Qt::FillRule)"> + <modify-function signature="drawPolygon(const QPoint*,int,Qt::FillRule)" remove="all" /> + <add-function signature="drawPolygon(QVector<QPoint>,Qt::FillRule)"> <inject-code> %BEGIN_ALLOW_THREADS %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2); %END_ALLOW_THREADS </inject-code> </add-function> - <modify-function signature="drawPolygon(const QPointF*, int, Qt::FillRule)" remove="all" /> - <add-function signature="drawPolygon(QVector<QPointF>, Qt::FillRule)"> + <modify-function signature="drawPolygon(const QPointF*,int,Qt::FillRule)" remove="all" /> + <add-function signature="drawPolygon(QVector<QPointF>,Qt::FillRule)"> <inject-code> %BEGIN_ALLOW_THREADS %CPPSELF.%FUNCTION_NAME(%1.data(), %1.size(), %2); %END_ALLOW_THREADS </inject-code> </add-function> - <modify-function signature="drawPolyline(const QPoint*, int)" remove="all" /> + <modify-function signature="drawPolyline(const QPoint*,int)" remove="all" /> <add-function signature="drawPolyline(QVector<QPoint>)"> <inject-code> <insert-template name="qpainter_drawlist" /> </inject-code> </add-function> - <modify-function signature="drawPolyline(const QPointF*, int)" remove="all" /> + <modify-function signature="drawPolyline(const QPointF*,int)" remove="all" /> <add-function signature="drawPolyline(QVector<QPointF>)"> <inject-code> <insert-template name="qpainter_drawlist" /> </inject-code> </add-function> - <modify-function signature="drawRoundRect(int, int, int, int, int, int)"> + <modify-function signature="drawRoundRect(int,int,int,int,int,int)"> <modify-argument index="5"> <rename to="xRound"/> </modify-argument> @@ -2295,7 +2295,7 @@ <rename to="yRound"/> </modify-argument> </modify-function> - <modify-function signature="drawTiledPixmap(const QRect&,const QPixmap&, const QPoint&)"> + <modify-function signature="drawTiledPixmap(const QRect&,const QPixmap&,const QPoint&)"> <modify-argument index="3"> <rename to="pos"/> </modify-argument> @@ -2310,7 +2310,7 @@ <no-null-pointer/> </modify-argument> </modify-function> - <modify-function signature="setRedirected(const QPaintDevice*, QPaintDevice*, const QPoint&)"> + <modify-function signature="setRedirected(const QPaintDevice*,QPaintDevice*,const QPoint&)"> <modify-argument index="1"> <no-null-pointer/> </modify-argument> @@ -3004,7 +3004,7 @@ </insert-template> </inject-code> </modify-function> - <modify-function signature="copyDataTo(float *) const"> + <modify-function signature="copyDataTo(float*)const"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -3035,11 +3035,11 @@ </modify-function> <!-- ### "constData() const" and "data() const" are unnecessary in Python and their function is performed by "data()". --> - <modify-function signature="data() const" remove="all"/> - <modify-function signature="constData() const" remove="all"/> + <modify-function signature="data()const" remove="all"/> + <modify-function signature="constData()const" remove="all"/> <!-- ### --> - <modify-function signature="operator()(int, int) const" remove="all"/> - <modify-function signature="operator()(int, int)" remove="all"/> + <modify-function signature="operator()(int,int)const" remove="all"/> + <modify-function signature="operator()(int,int)" remove="all"/> <add-function signature="__mgetitem__" return-type="PyObject*"> <inject-code> if (PySequence_Check(_key)) { @@ -3082,9 +3082,9 @@ </add-function> <!-- Qt5.5: XXX support the output variables! For now, I just suppressed the new methods. --> - <modify-function signature="getAxisAndAngle(float *, float *, float *, float *) const" since="5.5" remove="all" /> - <modify-function signature="getAxisAndAngle(QVector3D *, float *) const" since="5.5" remove="all" /> - <modify-function signature="getEulerAngles(float *, float *, float *) const" since="5.5" remove="all" /> + <modify-function signature="getAxisAndAngle(float*,float*,float*,float*)const" since="5.5" remove="all" /> + <modify-function signature="getAxisAndAngle(QVector3D*,float*)const" since="5.5" remove="all" /> + <modify-function signature="getEulerAngles(float*,float*,float*)const" since="5.5" remove="all" /> </value-type> <object-type name="QTouchEvent" since="4.6"> @@ -3202,7 +3202,7 @@ This seems to be a related problem with unnamed structures in shiboken. --> <suppress-warning text="enum 'QMatrix4x4::enum_1' is specified in typesystem, but not declared"/> - + <object-type name="QSessionManager"> <extra-includes> </extra-includes> @@ -3315,7 +3315,7 @@ <modify-function signature="glDeleteSamplers(int,const unsigned int*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> - <modify-function signature="glDeleteTransformFeedbacks(int,const unsigned int *)"> + <modify-function signature="glDeleteTransformFeedbacks(int,const unsigned int*)"> <modify-argument index="2"><array/></modify-argument> </modify-function> <modify-function signature="glDeleteVertexArrays(int,const unsigned int*)"> @@ -3633,13 +3633,13 @@ <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-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-function signature="setUniformValueArray(const char*,const unsigned int*,int)"> <modify-argument index="2"><array/></modify-argument> </modify-function> </object-type> diff --git a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml index 6bd5dd364..bcaa5fee3 100644 --- a/sources/pyside2/PySide2/QtHelp/typesystem_help.xml +++ b/sources/pyside2/PySide2/QtHelp/typesystem_help.xml @@ -44,7 +44,7 @@ <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no" /> <value-type name="QHelpContentItem"> - <modify-function signature="parent() const"> + <modify-function signature="parent()const"> <modify-argument index="return"> <define-ownership owner="default"/> </modify-argument> diff --git a/sources/pyside2/PySide2/QtLocation/CMakeLists.txt b/sources/pyside2/PySide2/QtLocation/CMakeLists.txt new file mode 100644 index 000000000..f968d1a1c --- /dev/null +++ b/sources/pyside2/PySide2/QtLocation/CMakeLists.txt @@ -0,0 +1,80 @@ +project(QtLocation) + +set(QtLocation_OPTIONAL_SRC ) +set(QtLocation_DROPPED_ENTRIES ) + +set(QtLocation_SRC +${QtLocation_GEN_DIR}/qgeocodereply_wrapper.cpp +${QtLocation_GEN_DIR}/qgeomaneuver_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoroute_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoroutereply_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoroutesegment_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoserviceprovider_wrapper.cpp +${QtLocation_GEN_DIR}/qplace_wrapper.cpp +${QtLocation_GEN_DIR}/qplacecontentreply_wrapper.cpp +${QtLocation_GEN_DIR}/qplacedetailsreply_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceicon_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceidreply_wrapper.cpp +${QtLocation_GEN_DIR}/qplacemanager_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceuser_wrapper.cpp +${QtLocation_GEN_DIR}/qgeocodingmanager_wrapper.cpp +${QtLocation_GEN_DIR}/qgeocodingmanagerengine_wrapper.cpp +${QtLocation_GEN_DIR}/qgeorouterequest_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoroutingmanager_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoroutingmanagerengine_wrapper.cpp +${QtLocation_GEN_DIR}/qgeoserviceproviderfactory_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceattribute_wrapper.cpp +${QtLocation_GEN_DIR}/qplacecategory_wrapper.cpp +${QtLocation_GEN_DIR}/qplacecontactdetail_wrapper.cpp +${QtLocation_GEN_DIR}/qplacecontent_wrapper.cpp +${QtLocation_GEN_DIR}/qplacecontentrequest_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceeditorial_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceimage_wrapper.cpp +${QtLocation_GEN_DIR}/qplacemanagerengine_wrapper.cpp +${QtLocation_GEN_DIR}/qplacematchreply_wrapper.cpp +${QtLocation_GEN_DIR}/qplacematchrequest_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceproposedsearchresult_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceratings_wrapper.cpp +${QtLocation_GEN_DIR}/qplacereply_wrapper.cpp +${QtLocation_GEN_DIR}/qplaceresult_wrapper.cpp +${QtLocation_GEN_DIR}/qplacereview_wrapper.cpp +${QtLocation_GEN_DIR}/qplacesearchreply_wrapper.cpp +${QtLocation_GEN_DIR}/qplacesearchrequest_wrapper.cpp +${QtLocation_GEN_DIR}/qplacesearchresult_wrapper.cpp +${QtLocation_GEN_DIR}/qplacesearchsuggestionreply_wrapper.cpp +${QtLocation_GEN_DIR}/qplacesupplier_wrapper.cpp +# module is always needed +${QtLocation_GEN_DIR}/qtlocation_module_wrapper.cpp +) + +if (Qt5Location_VERSION VERSION_EQUAL 5.11.0 OR Qt5Location_VERSION VERSION_GREATER 5.11.0) + list(APPEND QtLocation_SRC + ${QtLocation_GEN_DIR}/qgeoserviceproviderfactoryv2_wrapper.cpp) +endif() + +set(QtLocation_include_dirs ${QtLocation_SOURCE_DIR} + ${QtLocation_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Location_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ${QtPositioning_GEN_DIR}) + +set(QtLocation_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5Location_LIBRARIES}) + +set(QtLocation_deps QtCore QtPositioning) + +create_pyside_module(QtLocation + QtLocation_include_dirs + QtLocation_libraries + QtLocation_deps + QtLocation_SOURCE_DIR + QtLocation_SRC + "" + "" + QtLocation_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtLocation/typesystem_location.xml b/sources/pyside2/PySide2/QtLocation/typesystem_location.xml new file mode 100644 index 000000000..de8fbca7f --- /dev/null +++ b/sources/pyside2/PySide2/QtLocation/typesystem_location.xml @@ -0,0 +1,112 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of PySide2. +** +** $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.QtLocation"> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <load-typesystem name="QtPositioning/typesystem_positioning.xml" generate="no"/> + <object-type name="QGeoCodeReply"> + <enum-type name="Error"/> + </object-type> + <value-type name="QGeoManeuver"> + <enum-type name="InstructionDirection"/> + </value-type> + <value-type name="QGeoRoute"/> + <object-type name="QGeoRouteReply"> + <enum-type name="Error"/> + </object-type> + <value-type name="QGeoRouteSegment"/> + <object-type name="QGeoServiceProvider"> + <enum-type name="Error"/> + <enum-type name="RoutingFeature" flags="RoutingFeatures"/> + <enum-type name="GeocodingFeature" flags="GeocodingFeatures"/> + <enum-type name="MappingFeature" flags="MappingFeatures"/> + <enum-type name="PlacesFeature" flags="PlacesFeatures"/> + <enum-type name="NavigationFeature" flags="NavigationFeatures"/> + </object-type> + <value-type name="QPlace"/> + <object-type name="QPlaceContentReply"/> + <object-type name="QPlaceDetailsReply"/> + <value-type name="QPlaceIcon"/> + <object-type name="QPlaceIdReply"> + <enum-type name="OperationType"/> + </object-type> + <object-type name="QPlaceManager"/> + <value-type name="QPlaceUser"/> + <object-type name="QGeoCodingManager"/> + <object-type name="QGeoCodingManagerEngine"/> + <object-type name="QGeoRouteRequest"> + <enum-type name="TravelMode" flags="TravelModes"/> + <enum-type name="FeatureType" flags="FeatureTypes"/> + <enum-type name="FeatureWeight" flags="FeatureWeights"/> + <enum-type name="RouteOptimization" flags="RouteOptimizations"/> + <enum-type name="SegmentDetail" flags="SegmentDetails"/> + <enum-type name="ManeuverDetail" flags="ManeuverDetails"/> + </object-type> + <object-type name="QGeoRoutingManager"/> + <object-type name="QGeoRoutingManagerEngine"/> + <object-type name="QGeoServiceProviderFactory"/> + <object-type name="QGeoServiceProviderFactoryV2" since="5.11"/> + <value-type name="QPlaceAttribute"/> + <value-type name="QPlaceCategory"/> + <value-type name="QPlaceContactDetail"/> + <value-type name="QPlaceContent"/> + <value-type name="QPlaceContentRequest"/> + <object-type name="QPlaceEditorial"/> + <object-type name="QPlaceImage"/> + <object-type name="QPlaceManagerEngine"/> + <object-type name="QPlaceMatchReply"/> + <value-type name="QPlaceMatchRequest"/> + <object-type name="QPlaceProposedSearchResult"/> + <value-type name="QPlaceRatings"/> + <object-type name="QPlaceReply"> + <enum-type name="Error"/> + <enum-type name="Type"/> + </object-type> + <object-type name="QPlaceResult"/> + <object-type name="QPlaceReview"/> + <object-type name="QPlaceSearchReply"/> + <object-type name="QPlaceSearchRequest"> + <enum-type name="RelevanceHint"/> + </object-type> + <object-type name="QPlaceSearchResult"/> + <object-type name="QPlaceSearchSuggestionReply"/> + <value-type name="QPlaceSupplier"/> +</typesystem> diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml index 35effbc73..15c0729e2 100644 --- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml +++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml @@ -59,9 +59,9 @@ <object-type name="QAbstractVideoBuffer"> <enum-type name="HandleType"/> <enum-type name="MapMode"/> - <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)" remove="all"/> + <modify-function signature="map(QAbstractVideoBuffer::MapMode,int*,int*)" remove="all"/> <!-- TODO: discuss a way to have this working with the virtual method. - <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)"> + <modify-function signature="map(QAbstractVideoBuffer::MapMode,int*,int*)"> <modify-argument index="0"> <replace-type modified-type="PyObject"/> </modify-argument> @@ -87,7 +87,7 @@ <enum-type name="FieldType"/> <enum-type name="PixelFormat"/> <modify-function signature="bits(int)" remove="all"/> - <modify-function signature="bits(int) const" remove="all"/> + <modify-function signature="bits(int)const" remove="all"/> </value-type> <value-type name="QAudioBuffer"/> @@ -108,7 +108,7 @@ <define-ownership class="target" owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="start(QIODevice *)"> + <modify-function signature="start(QIODevice*)"> <modify-argument index="1"> <define-ownership class="target" owner="c++"/> </modify-argument> @@ -121,7 +121,7 @@ <define-ownership class="target" owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="start(QIODevice *)"> + <modify-function signature="start(QIODevice*)"> <modify-argument index="1"> <define-ownership class="target" owner="c++"/> </modify-argument> @@ -132,7 +132,7 @@ <object-type name="QAudioProbe"/> <value-type name="QAudioEncoderSettings"/> <object-type name="QAudioEncoderSettingsControl"> - <modify-function signature="supportedSampleRates(const QAudioEncoderSettings &, bool *) const" remove="all"/> + <modify-function signature="supportedSampleRates(const QAudioEncoderSettings &,bool*)const" remove="all"/> </object-type> <object-type name="QAudioInput"> @@ -175,7 +175,7 @@ <enum-type name="Position"/> <enum-type name="State"/> <enum-type name="Status"/> - <modify-function signature="setViewfinder(QVideoWidget *)"> + <modify-function signature="setViewfinder(QVideoWidget*)"> <modify-argument index="1"> <replace-type modified-type="QObject *" /> </modify-argument> @@ -186,7 +186,7 @@ %END_ALLOW_THREADS </inject-code> </modify-function> - <modify-function signature="setViewfinder(QGraphicsVideoItem *)"> + <modify-function signature="setViewfinder(QGraphicsVideoItem*)"> <modify-argument index="1"> <replace-type modified-type="QObject *" /> </modify-argument> @@ -208,14 +208,14 @@ <enum-type name="FlashMode" flags="FlashModes"/> <enum-type name="ExposureMode"/> <enum-type name="MeteringMode"/> - <modify-function signature="supportedApertures(bool *) const" remove="all"/> - <modify-function signature="supportedIsoSensitivities(bool *) const" remove="all"/> - <modify-function signature="supportedShutterSpeeds(bool *) const" remove="all"/> + <modify-function signature="supportedApertures(bool*)const" remove="all"/> + <modify-function signature="supportedIsoSensitivities(bool*)const" remove="all"/> + <modify-function signature="supportedShutterSpeeds(bool*)const" remove="all"/> </object-type> --> <object-type name="QCameraExposureControl"> <enum-type name="ExposureParameter"/> - <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter, bool *) const" remove="all"/> + <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter,bool*)const" remove="all"/> </object-type> <value-type name="QCameraFocusZone"> <enum-type name="FocusZoneStatus"/> @@ -232,7 +232,7 @@ <enum-type name="CaptureDestination" flags="CaptureDestinations"/> <enum-type name="DriveMode"/> <enum-type name="Error"/> - <modify-function signature="supportedResolutions(const QImageEncoderSettings &, bool *) const" remove="all"/> + <modify-function signature="supportedResolutions(const QImageEncoderSettings &,bool*)const" remove="all"/> </object-type> <object-type name="QCameraImageCaptureControl"/> <!-- Private destructor @@ -254,7 +254,7 @@ <value-type name="QImageEncoderSettings"/> <object-type name="QImageEncoderControl"> - <modify-function signature="supportedResolutions(const QImageEncoderSettings &, bool *) const" remove="all"/> + <modify-function signature="supportedResolutions(const QImageEncoderSettings &,bool*)const" remove="all"/> </object-type> <object-type name="QMediaAudioProbeControl"/> @@ -275,7 +275,7 @@ <enum-type name="MediaStatus"/> <enum-type name="Flag" flags="Flags"/> <enum-type name="Error"/> - <modify-function signature="setVideoOutput(QVideoWidget *)"> + <modify-function signature="setVideoOutput(QVideoWidget*)"> <modify-argument index="1"> <replace-type modified-type="QObject *" /> </modify-argument> @@ -286,7 +286,7 @@ %END_ALLOW_THREADS </inject-code> </modify-function> - <modify-function signature="setVideoOutput(QGraphicsVideoItem *)"> + <modify-function signature="setVideoOutput(QGraphicsVideoItem*)"> <modify-argument index="1"> <replace-type modified-type="QObject *" /> </modify-argument> @@ -307,9 +307,9 @@ <enum-type name="Error"/> <enum-type name="State"/> <enum-type name="Status"/> - <modify-function signature="supportedAudioSampleRates(const QAudioEncoderSettings &, bool *) const" remove="all"/> - <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &, bool *) const" remove="all"/> - <modify-function signature="supportedResolutions(const QVideoEncoderSettings &, bool *) const" remove="all"/> + <modify-function signature="supportedAudioSampleRates(const QAudioEncoderSettings &,bool*)const" remove="all"/> + <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &,bool*)const" remove="all"/> + <modify-function signature="supportedResolutions(const QVideoEncoderSettings &,bool*)const" remove="all"/> </object-type> <object-type name="QMediaRecorderControl"/> <value-type name="QMediaResource"/> @@ -346,8 +346,8 @@ <object-type name="QVideoDeviceSelectorControl"/> <value-type name="QVideoEncoderSettings"/> <object-type name="QVideoEncoderSettingsControl"> - <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &, bool *) const" remove="all"/> - <modify-function signature="supportedResolutions(const QVideoEncoderSettings &, bool *) const" remove="all"/> + <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &,bool*)const" remove="all"/> + <modify-function signature="supportedResolutions(const QVideoEncoderSettings &,bool*)const" remove="all"/> </object-type> <object-type name="QVideoFilterRunnable"> <enum-type name="RunFlag" flags="RunFlags"/> diff --git a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml index 4e47c6ef5..94e6c77de 100644 --- a/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml +++ b/sources/pyside2/PySide2/QtNetwork/typesystem_network.xml @@ -64,8 +64,8 @@ <enum-type name="SocketOption" since="4.6"/> <enum-type name="SocketState"/> <enum-type name="SocketType"/> - <modify-function signature="connectToHost(const QString&, quint16, QFlags<QIODevice::OpenModeFlag>, QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" /> - <modify-function signature="connectToHost(const QHostAddress&, quint16, QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes" /> + <modify-function signature="connectToHost(const QString&,quint16,QFlags<QIODevice::OpenModeFlag>,QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" /> + <modify-function signature="connectToHost(const QHostAddress&,quint16,QFlags<QIODevice::OpenModeFlag>)" allow-thread="yes" /> <modify-function signature="disconnectFromHost()" allow-thread="yes" /> <modify-function signature="waitForConnected(int)" allow-thread="yes" /> <modify-function signature="waitForDisconnected(int)" allow-thread="yes" /> @@ -91,7 +91,7 @@ </object-type> <object-type name="QTcpSocket"/> <object-type name="QUdpSocket"> - <modify-function signature="readDatagram(char*, qint64, QHostAddress*, quint16*)" allow-thread="yes"> + <modify-function signature="readDatagram(char*,qint64,QHostAddress*,quint16*)" allow-thread="yes"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -120,7 +120,7 @@ PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port)); </inject-code> </modify-function> - <modify-function signature="writeDatagram(const QByteArray&, const QHostAddress&, quint16)" allow-thread="yes"/> + <modify-function signature="writeDatagram(const QByteArray&,const QHostAddress&,quint16)" allow-thread="yes"/> <!-- ### writeDatagram(QByteArray, ...) does the trick --> <modify-function signature="writeDatagram(const char*,qint64,const QHostAddress&,quint16)" remove="all"/> <!-- ### --> @@ -153,18 +153,18 @@ <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-function signature="createRequest(QNetworkAccessManager::Operation,const QNetworkRequest&,QIODevice*)"> <modify-argument index="3" invalidate-after-use="yes"/> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> <modify-function signature="get(const QNetworkRequest&)" allow-thread="yes"/> - <modify-function signature="post(const QNetworkRequest &, QIODevice *)" allow-thread="yes"/> - <modify-function signature="post(const QNetworkRequest &, const QByteArray &)" allow-thread="yes"/> - <modify-function signature="put(const QNetworkRequest &, QIODevice *)" allow-thread="yes"/> - <modify-function signature="put(const QNetworkRequest &, const QByteArray &)" allow-thread="yes"/> - <modify-function signature="sendCustomRequest(const QNetworkRequest &, const QByteArray &, QIODevice *)" allow-thread="yes" since="4.7" /> + <modify-function signature="post(const QNetworkRequest &,QIODevice*)" allow-thread="yes"/> + <modify-function signature="post(const QNetworkRequest &,const QByteArray &)" allow-thread="yes"/> + <modify-function signature="put(const QNetworkRequest &,QIODevice*)" allow-thread="yes"/> + <modify-function signature="put(const QNetworkRequest &,const QByteArray &)" allow-thread="yes"/> + <modify-function signature="sendCustomRequest(const QNetworkRequest &,const QByteArray &,QIODevice*)" allow-thread="yes" since="4.7" /> <modify-function signature="setCookieJar(QNetworkCookieJar*)"> <modify-argument index="1"> <define-ownership class="target" owner="c++"/> @@ -304,7 +304,7 @@ <object-type name="QSslSocket"> <enum-type name="SslMode"/> <enum-type name="PeerVerifyMode"/> - <modify-function signature="connectToHostEncrypted(const QString&, quint16, QFlags<QIODevice::OpenModeFlag>, QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" /> + <modify-function signature="connectToHostEncrypted(const QString&,quint16,QFlags<QIODevice::OpenModeFlag>,QAbstractSocket::NetworkLayerProtocol)" allow-thread="yes" /> <modify-function signature="waitForEncrypted(int)" allow-thread="yes" /> </object-type> <!-- The above entries may be present in the system or not. Keep this section organized. --> diff --git a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml index 38cec3188..9b7adb71a 100644 --- a/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml +++ b/sources/pyside2/PySide2/QtOpenGL/typesystem_opengl.xml @@ -99,7 +99,7 @@ </modify-function> <!-- ### Obsolete functions and ctors --> - <modify-function signature="QGLContext(const QGLFormat&, QPaintDevice*)" remove="all" /> + <modify-function signature="QGLContext(const QGLFormat&,QPaintDevice*)" remove="all" /> <!-- ### --> </object-type> <object-type name="QGLFramebufferObject"> @@ -115,7 +115,7 @@ <include file-name="QImage" location="global"/> <include file-name="QPixmap" location="global"/> </extra-includes> - <modify-function signature="QGLWidget(QGLContext*, QWidget*, const QGLWidget*, QFlags<Qt::WindowType>)"> + <modify-function signature="QGLWidget(QGLContext*,QWidget*,const QGLWidget*,QFlags<Qt::WindowType>)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -156,7 +156,7 @@ <object-type name="QGLShaderProgram" since="4.6"> <!-- setAttributeArray --> - <modify-function signature="setAttributeArray(int, const QVector2D*, int)" rename="setAttributeArray2D"> + <modify-function signature="setAttributeArray(int,const QVector2D*,int)" rename="setAttributeArray2D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -169,7 +169,7 @@ </inject-code> </modify-function> - <modify-function signature="setAttributeArray(int, const QVector3D*, int)" rename="setAttributeArray3D"> + <modify-function signature="setAttributeArray(int,const QVector3D*,int)" rename="setAttributeArray3D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -182,7 +182,7 @@ </inject-code> </modify-function> - <modify-function signature="setAttributeArray(int, const QVector4D*, int)" rename="setAttributeArray4D"> + <modify-function signature="setAttributeArray(int,const QVector4D*,int)" rename="setAttributeArray4D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -195,7 +195,7 @@ </inject-code> </modify-function> - <modify-function signature="setAttributeArray(const char*, const QVector2D*, int)" rename="setAttributeArray2D"> + <modify-function signature="setAttributeArray(const char*,const QVector2D*,int)" rename="setAttributeArray2D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -208,7 +208,7 @@ </inject-code> </modify-function> - <modify-function signature="setAttributeArray(const char*, const QVector3D*, int)" rename="setAttributeArray3D"> + <modify-function signature="setAttributeArray(const char*,const QVector3D*,int)" rename="setAttributeArray3D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -221,7 +221,7 @@ </inject-code> </modify-function> - <modify-function signature="setAttributeArray(const char*, const QVector4D*, int)" rename="setAttributeArray4D"> + <modify-function signature="setAttributeArray(const char*,const QVector4D*,int)" rename="setAttributeArray4D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -235,7 +235,7 @@ </modify-function> <!-- setUniformValueArray --> - <modify-function signature="setUniformValueArray(int, const GLint*, int)" rename="setUniformValueArrayInt"> + <modify-function signature="setUniformValueArray(int,const GLint*,int)" rename="setUniformValueArrayInt"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -251,7 +251,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const GLuint*, int)" rename="setUniformValueArrayUint"> + <modify-function signature="setUniformValueArray(int,const GLuint*,int)" rename="setUniformValueArrayUint"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -267,7 +267,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QVector2D*, int)" rename="setUniformValueArray2D"> + <modify-function signature="setUniformValueArray(int,const QVector2D*,int)" rename="setUniformValueArray2D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -283,7 +283,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QVector3D*, int)" rename="setUniformValueArray3D"> + <modify-function signature="setUniformValueArray(int,const QVector3D*,int)" rename="setUniformValueArray3D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -299,7 +299,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QVector4D*, int)" rename="setUniformValueArray4D"> + <modify-function signature="setUniformValueArray(int,const QVector4D*,int)" rename="setUniformValueArray4D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -315,7 +315,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix2x2*, int)" rename="setUniformValueArray2x2"> + <modify-function signature="setUniformValueArray(int,const QMatrix2x2*,int)" rename="setUniformValueArray2x2"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -331,7 +331,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix2x3*, int)" rename="setUniformValueArray2x3"> + <modify-function signature="setUniformValueArray(int,const QMatrix2x3*,int)" rename="setUniformValueArray2x3"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -347,7 +347,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix2x4*, int)" rename="setUniformValueArray2x4"> + <modify-function signature="setUniformValueArray(int,const QMatrix2x4*,int)" rename="setUniformValueArray2x4"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -363,7 +363,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix3x2*, int)" rename="setUniformValueArray3x2"> + <modify-function signature="setUniformValueArray(int,const QMatrix3x2*,int)" rename="setUniformValueArray3x2"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -379,7 +379,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix3x3*, int)" rename="setUniformValueArray3x3"> + <modify-function signature="setUniformValueArray(int,const QMatrix3x3*,int)" rename="setUniformValueArray3x3"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -395,7 +395,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix3x4*, int)" rename="setUniformValueArray3x4"> + <modify-function signature="setUniformValueArray(int,const QMatrix3x4*,int)" rename="setUniformValueArray3x4"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -411,7 +411,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix4x2*, int)" rename="setUniformValueArray4x2"> + <modify-function signature="setUniformValueArray(int,const QMatrix4x2*,int)" rename="setUniformValueArray4x2"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -427,7 +427,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix4x3*, int)" rename="setUniformValueArray4x3"> + <modify-function signature="setUniformValueArray(int,const QMatrix4x3*,int)" rename="setUniformValueArray4x3"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -443,7 +443,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(int, const QMatrix4x4*, int)" rename="setUniformValueArray4x4"> + <modify-function signature="setUniformValueArray(int,const QMatrix4x4*,int)" rename="setUniformValueArray4x4"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -459,7 +459,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const GLint*, int)" rename="setUniformValueArrayInt"> + <modify-function signature="setUniformValueArray(const char*,const GLint*,int)" rename="setUniformValueArrayInt"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -475,7 +475,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const GLuint*, int)" rename="setUniformValueArrayUint"> + <modify-function signature="setUniformValueArray(const char*,const GLuint*,int)" rename="setUniformValueArrayUint"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -491,7 +491,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QVector2D*, int)" rename="setUniformValueArray2D"> + <modify-function signature="setUniformValueArray(const char*,const QVector2D*,int)" rename="setUniformValueArray2D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -507,7 +507,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QVector3D*, int)" rename="setUniformValueArray3D"> + <modify-function signature="setUniformValueArray(const char*,const QVector3D*,int)" rename="setUniformValueArray3D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -523,7 +523,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QVector4D*, int)" rename="setUniformValueArray4D"> + <modify-function signature="setUniformValueArray(const char*,const QVector4D*,int)" rename="setUniformValueArray4D"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -539,7 +539,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix2x2*, int)" rename="setUniformValueArray2x2"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix2x2*,int)" rename="setUniformValueArray2x2"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -555,7 +555,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix2x3*, int)" rename="setUniformValueArray2x3"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix2x3*,int)" rename="setUniformValueArray2x3"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -571,7 +571,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix2x4*, int)" rename="setUniformValueArray2x4"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix2x4*,int)" rename="setUniformValueArray2x4"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -587,7 +587,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix3x2*, int)" rename="setUniformValueArray3x2"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix3x2*,int)" rename="setUniformValueArray3x2"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -603,7 +603,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix3x3*, int)" rename="setUniformValueArray3x3"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix3x3*,int)" rename="setUniformValueArray3x3"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -619,7 +619,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix3x4*, int)" rename="setUniformValueArray3x4"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix3x4*,int)" rename="setUniformValueArray3x4"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -635,7 +635,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix4x2*, int)" rename="setUniformValueArray4x2"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix4x2*,int)" rename="setUniformValueArray4x2"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -651,7 +651,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix4x3*, int)" rename="setUniformValueArray4x3"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix4x3*,int)" rename="setUniformValueArray4x3"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -667,7 +667,7 @@ </inject-code> </modify-function> - <modify-function signature="setUniformValueArray(const char*, const QMatrix4x4*, int)" rename="setUniformValueArray4x4"> + <modify-function signature="setUniformValueArray(const char*,const QMatrix4x4*,int)" rename="setUniformValueArray4x4"> <modify-argument index="2" > <replace-type modified-type="PySequence" /> </modify-argument> @@ -693,8 +693,8 @@ <!-- ### Use QMatrixZxY overloads --> <modify-function signature="setAttributeValue(int,const GLfloat*,int,int)" remove="all" /> <modify-function signature="setAttributeValue(const char*,const GLfloat*,int,int)" remove="all" /> - <modify-function signature="setAttributeArray(int, GLenum, const void*, int, int)" remove="all" since="4.7" /> - <modify-function signature="setAttributeArray(const char*, GLenum, const void*, int, int)" remove="all" since="4.7" /> + <modify-function signature="setAttributeArray(int,GLenum,const void*,int,int)" remove="all" since="4.7" /> + <modify-function signature="setAttributeArray(const char*,GLenum,const void*,int,int)" remove="all" since="4.7" /> <!-- ### --> </object-type> @@ -703,7 +703,7 @@ <enum-type name="Access" since="4.7"/> <enum-type name="Type" since="4.7"/> <enum-type name="UsagePattern" since="4.7"/> - <modify-function signature="allocate(const void*, int)"> + <modify-function signature="allocate(const void*,int)"> <modify-argument index="1"> <replace-type modified-type="QByteArray&"/> </modify-argument> @@ -730,7 +730,7 @@ } </inject-code> </modify-function> - <modify-function signature="read(int, void*, int)"> + <modify-function signature="read(int,void*,int)"> <modify-argument index="2"> <remove-argument/> </modify-argument> @@ -749,7 +749,7 @@ delete[] data; </inject-code> </modify-function> - <modify-function signature="write(int, const void*, int)"> + <modify-function signature="write(int,const void*,int)"> <modify-argument index="2"> <replace-type modified-type="QByteArray&"/> </modify-argument> diff --git a/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt new file mode 100644 index 000000000..3a2eb9cf5 --- /dev/null +++ b/sources/pyside2/PySide2/QtPositioning/CMakeLists.txt @@ -0,0 +1,55 @@ +project(QtPositioning) + +set(QtPositioning_OPTIONAL_SRC ) +set(QtPositioning_DROPPED_ENTRIES ) + +set(QtPositioning_SRC +${QtPositioning_GEN_DIR}/qgeoaddress_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeoareamonitorinfo_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeoareamonitorsource_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeolocation_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeocircle_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeocoordinate_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopath_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopositioninfo_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopositioninfosource_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeopositioninfosourcefactory_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeorectangle_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeosatelliteinfo_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeosatelliteinfosource_wrapper.cpp +${QtPositioning_GEN_DIR}/qgeoshape_wrapper.cpp +${QtPositioning_GEN_DIR}/qnmeapositioninfosource_wrapper.cpp +# module is always needed +${QtPositioning_GEN_DIR}/qtpositioning_module_wrapper.cpp +) + +if (Qt5Positioning_VERSION VERSION_EQUAL 5.10.0 OR Qt5Positioning_VERSION VERSION_GREATER 5.10.0) + list(APPEND QtPositioning_SRC + ${QtPositioning_GEN_DIR}/qgeopolygon_wrapper.cpp) +endif() + +set(QtPositioning_include_dirs ${QtPositioning_SOURCE_DIR} + ${QtPositioning_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Positioning_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR}) + +set(QtPositioning_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5Positioning_LIBRARIES}) + +set(QtPositioning_deps QtCore) + +create_pyside_module(QtPositioning + QtPositioning_include_dirs + QtPositioning_libraries + QtPositioning_deps + QtPositioning_SOURCE_DIR + QtPositioning_SRC + "" + "" + QtPositioning_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtPositioning/typesystem_positioning.xml b/sources/pyside2/PySide2/QtPositioning/typesystem_positioning.xml new file mode 100644 index 000000000..058994ad0 --- /dev/null +++ b/sources/pyside2/PySide2/QtPositioning/typesystem_positioning.xml @@ -0,0 +1,80 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of PySide2. +** +** $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.QtPositioning"> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + <value-type name="QGeoAddress"/> + <value-type name="QGeoAreaMonitorInfo"/> + <object-type name="QGeoAreaMonitorSource"> + <enum-type name="Error"/> + <enum-type name="AreaMonitorFeature" flags="AreaMonitorFeatures"/> + </object-type> + <value-type name="QGeoLocation"/> + <value-type name="QGeoCircle"/> + <value-type name="QGeoCoordinate"> + <enum-type name="CoordinateType"/> + <enum-type name="CoordinateFormat"/> + </value-type> + <value-type name="QGeoPath"/> + <value-type name="QGeoPolygon" since="5.10"/> + <value-type name="QGeoPositionInfo"> + <enum-type name="Attribute"/> + </value-type> + <object-type name="QGeoPositionInfoSource"> + <enum-type name="Error"/> + <enum-type name="PositioningMethod" flags="PositioningMethods"/> + </object-type> + <object-type name="QGeoPositionInfoSourceFactory"/> + <value-type name="QGeoRectangle"/> + <value-type name="QGeoSatelliteInfo"> + <enum-type name="Attribute"/> + <enum-type name="SatelliteSystem"/> + </value-type> + <object-type name="QGeoSatelliteInfoSource"> + <enum-type name="Error"/> + </object-type> + <value-type name="QGeoShape"> + <enum-type name="ShapeType"/> + </value-type> + <object-type name="QNmeaPositionInfoSource"> + <enum-type name="UpdateMode"/> + </object-type> +</typesystem> diff --git a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml index 24f0de1d8..daf0ed763 100644 --- a/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml +++ b/sources/pyside2/PySide2/QtPrintSupport/typesystem_printsupport.xml @@ -50,7 +50,7 @@ <enum-type name="PrintDialogOption" flags="PrintDialogOptions" /> <enum-type name="PrintRange" /> </object-type> - + <object-type name="QPrintDialog"> <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> </object-type> diff --git a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml index 54431a3af..385383fcc 100644 --- a/sources/pyside2/PySide2/QtQml/typesystem_qml.xml +++ b/sources/pyside2/PySide2/QtQml/typesystem_qml.xml @@ -54,7 +54,7 @@ in generator tests folder. --> </primitive-type> - <add-function signature="qmlRegisterType(PyTypeObject, const char*, int, int, const char*)" return-type="int"> + <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. Returns the QML type id. @@ -123,7 +123,7 @@ <enum-type name="ObjectOwnership" /> </object-type> <object-type name="QQmlExpression"> - <modify-function signature="evaluate(bool *)" allow-thread="yes"> + <modify-function signature="evaluate(bool*)" allow-thread="yes"> <modify-argument index="1"> <remove-argument /> </modify-argument> @@ -181,7 +181,7 @@ <object-type name="QQmlPropertyMap" /> <object-type name="QQmlPropertyValueSource" /> <value-type name="QQmlScriptString"> - <modify-function signature="numberLiteral(bool *) const" allow-thread="yes"> + <modify-function signature="numberLiteral(bool*)const" allow-thread="yes"> <modify-argument index="1"> <remove-argument /> </modify-argument> @@ -192,7 +192,7 @@ <insert-template name="fix_bool*"/> </inject-code> </modify-function> - <modify-function signature="booleanLiteral(bool *) const" allow-thread="yes"> + <modify-function signature="booleanLiteral(bool*)const" allow-thread="yes"> <modify-argument index="1"> <remove-argument /> </modify-argument> diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml index 5183ec798..d9373e86d 100644 --- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml +++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml @@ -70,7 +70,7 @@ <enum-type name="Flag" flags="Flags" /> <enum-type name="ItemChange" /> <enum-type name="TransformOrigin" /> - <modify-function signature="itemTransform(QQuickItem *, bool *) const" allow-thread="yes"> + <modify-function signature="itemTransform(QQuickItem*,bool*)const" allow-thread="yes"> <modify-argument index="2"> <remove-argument /> </modify-argument> diff --git a/sources/pyside2/PySide2/QtSensors/CMakeLists.txt b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt new file mode 100644 index 000000000..226625443 --- /dev/null +++ b/sources/pyside2/PySide2/QtSensors/CMakeLists.txt @@ -0,0 +1,106 @@ +project(QtSensors) + +set(QtSensors_OPTIONAL_SRC ) +set(QtSensors_DROPPED_ENTRIES ) + +set(QtSensors_SRC +# overrides QObject::metaObject() by private method +# ${QtSensors_GEN_DIR}/qsensorgesture_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorgesturemanager_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorgestureplugininterface_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorgesturerecognizer_wrapper.cpp + ${QtSensors_GEN_DIR}/qaccelerometer_wrapper.cpp + ${QtSensors_GEN_DIR}/qaccelerometerfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qaccelerometerreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qaltimeter_wrapper.cpp + ${QtSensors_GEN_DIR}/qaltimeterfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qaltimeterreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qambientlightfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qambientlightreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qambientlightsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qambienttemperaturefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qambienttemperaturereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qambienttemperaturesensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qcompass_wrapper.cpp + ${QtSensors_GEN_DIR}/qcompassfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qcompassreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qdistancefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qdistancereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qdistancesensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qgyroscope_wrapper.cpp + ${QtSensors_GEN_DIR}/qgyroscopefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qgyroscopereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qholsterfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qholsterreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qholstersensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qhumidityfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qhumidityreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qhumiditysensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qirproximityfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qirproximityreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qirproximitysensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qlidfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qlidreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qlidsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qlightfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qlightreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qlightsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qmagnetometer_wrapper.cpp + ${QtSensors_GEN_DIR}/qmagnetometerfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qmagnetometerreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qorientationfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qorientationreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qorientationsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qpressurefilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qpressurereading_wrapper.cpp + ${QtSensors_GEN_DIR}/qpressuresensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qproximityfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qproximityreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qproximitysensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qrotationfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qrotationreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qrotationsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qoutputrange_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorbackend_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorbackendfactory_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensormanager_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorchangesinterface_wrapper.cpp + ${QtSensors_GEN_DIR}/qsensorplugininterface_wrapper.cpp + ${QtSensors_GEN_DIR}/qtapfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qtapreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qtapsensor_wrapper.cpp + ${QtSensors_GEN_DIR}/qtiltfilter_wrapper.cpp + ${QtSensors_GEN_DIR}/qtiltreading_wrapper.cpp + ${QtSensors_GEN_DIR}/qtiltsensor_wrapper.cpp +# module is always needed + ${QtSensors_GEN_DIR}/qtsensors_module_wrapper.cpp +) + +set(QtSensors_include_dirs ${QtSensors_SOURCE_DIR} + ${QtSensors_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${Qt5Sensors_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR}) + +set(QtSensors_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5Sensors_LIBRARIES}) + +set(QtSensors_deps QtCore) + +create_pyside_module(QtSensors + QtSensors_include_dirs + QtSensors_libraries + QtSensors_deps + QtSensors_SOURCE_DIR + QtSensors_SRC + "" + "" + QtSensors_DROPPED_ENTRIES) diff --git a/sources/pyside2/PySide2/QtSensors/typesystem_sensors.xml b/sources/pyside2/PySide2/QtSensors/typesystem_sensors.xml new file mode 100644 index 000000000..45d64e0a2 --- /dev/null +++ b/sources/pyside2/PySide2/QtSensors/typesystem_sensors.xml @@ -0,0 +1,127 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of PySide2. +** +** $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.QtSensors"> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> +<!-- overrides QObject::metaObject() by private method + <object-type name="QSensorGesture"/> +--> + <object-type name="QSensorGestureManager"/> + <object-type name="QSensorGesturePluginInterface"/> + <object-type name="QSensorGestureRecognizer"/> + <object-type name="QAccelerometer"> + <enum-type name="AccelerationMode"/> + </object-type> + <object-type name="QAccelerometerFilter"/> + <object-type name="QAccelerometerReading"/> + <object-type name="QAltimeter"/> + <object-type name="QAltimeterFilter"/> + <object-type name="QAltimeterReading"/> + <object-type name="QAmbientLightFilter"/> + <object-type name="QAmbientLightReading"> + <enum-type name="LightLevel"/> + </object-type> + <object-type name="QAmbientLightSensor"/> + <object-type name="QAmbientTemperatureFilter"/> + <object-type name="QAmbientTemperatureReading"/> + <object-type name="QAmbientTemperatureSensor"/> + <object-type name="QCompass"/> + <object-type name="QCompassFilter"/> + <object-type name="QCompassReading"/> + <object-type name="QDistanceFilter"/> + <object-type name="QDistanceReading"/> + <object-type name="QDistanceSensor"/> + <object-type name="QGyroscope"/> + <object-type name="QGyroscopeFilter"/> + <object-type name="QGyroscopeReading"/> + <object-type name="QHolsterFilter"/> + <object-type name="QHolsterReading"/> + <object-type name="QHolsterSensor"/> + <object-type name="QHumidityFilter"/> + <object-type name="QHumidityReading"/> + <object-type name="QHumiditySensor"/> + <object-type name="QIRProximityFilter"/> + <object-type name="QIRProximityReading"/> + <object-type name="QIRProximitySensor"/> + <object-type name="QLidFilter"/> + <object-type name="QLidReading"/> + <object-type name="QLidSensor"/> + <object-type name="QLightFilter"/> + <object-type name="QLightReading"/> + <object-type name="QLightSensor"/> + <object-type name="QMagnetometer"/> + <object-type name="QMagnetometerFilter"/> + <object-type name="QMagnetometerReading"/> + <object-type name="QOrientationFilter"/> + <object-type name="QOrientationReading"> + <enum-type name="Orientation"/> + </object-type> + <object-type name="QOrientationSensor"/> + <object-type name="QPressureFilter"/> + <object-type name="QPressureReading"/> + <object-type name="QPressureSensor"/> + <object-type name="QProximityFilter"/> + <object-type name="QProximityReading"/> + <object-type name="QProximitySensor"/> + <object-type name="QRotationFilter"/> + <object-type name="QRotationReading"/> + <object-type name="QRotationSensor"/> + <object-type name="QSensor"> + <enum-type name="Feature"/> + <enum-type name="AxesOrientationMode"/> + </object-type> + <object-type name="QSensorFilter"/> + <object-type name="QSensorReading"/> + <value-type name="qoutputrange"/> + <object-type name="QSensorBackend"/> + <object-type name="QSensorBackendFactory"/> + <object-type name="QSensorManager"/> + <object-type name="QSensorChangesInterface"/> + <object-type name="QSensorPluginInterface"/> + <object-type name="QTapFilter"/> + <object-type name="QTapReading"> + <enum-type name="TapDirection"/> + </object-type> + <object-type name="QTapSensor"/> + <object-type name="QTiltFilter"/> + <object-type name="QTiltReading"/> + <object-type name="QTiltSensor"/> +</typesystem> diff --git a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml index 46836ef96..2e7222a16 100644 --- a/sources/pyside2/PySide2/QtSql/typesystem_sql.xml +++ b/sources/pyside2/PySide2/QtSql/typesystem_sql.xml @@ -52,7 +52,7 @@ <enum-type name="TableType"/> <enum-type name="NumericalPrecisionPolicy"/> <extra-includes> - <include file-name="QtSql/qsql.h" location="global"/> + <include file-name="QtSql/qtsqlglobal.h" location="global"/> </extra-includes> </namespace-type> @@ -71,7 +71,7 @@ <modify-function signature="commit()" allow-thread="yes" /> <modify-function signature="rollback()" allow-thread="yes" /> <modify-function signature="transaction()" allow-thread="yes" /> - <modify-function signature="registerSqlDriver(const QString &, QSqlDriverCreatorBase*)"> + <modify-function signature="registerSqlDriver(const QString&,QSqlDriverCreatorBase*)"> <modify-argument index="2"> <define-ownership owner="c++"/> </modify-argument> @@ -87,7 +87,7 @@ <include file-name="QSize" location="global"/> </extra-includes> <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> - <modify-function signature="exec(const QString &)" rename="exec_" allow-thread="yes" /> + <modify-function signature="exec(const QString&)" rename="exec_" allow-thread="yes" /> <modify-function signature="prepare(const QString&)" allow-thread="yes" /> <modify-function signature="clear()" allow-thread="yes" /> <modify-function signature="last()" allow-thread="yes" /> @@ -135,9 +135,9 @@ <modify-function signature="beginTransaction()" allow-thread="yes" /> <modify-function signature="commitTransaction()" allow-thread="yes" /> <modify-function signature="rollbackTransaction()" allow-thread="yes" /> - <modify-function signature="open(const QString &, const QString&, const QString&, const QString&, int, const QString&)" allow-thread="yes" /> + <modify-function signature="open(const QString&,const QString&,const QString&,const QString&,int,const QString&)" allow-thread="yes" /> <!-- ### This is too low level for Python, and pointer would be useless for the Python programmer --> - <modify-function signature="handle() const" remove="all"/> + <modify-function signature="handle()const" remove="all"/> <!-- ### --> </object-type> diff --git a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml index 059abb891..7d11970e7 100644 --- a/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml +++ b/sources/pyside2/PySide2/QtSvg/typesystem_svg.xml @@ -52,7 +52,7 @@ </modify-argument> </modify-function> - <modify-function signature="outputDevice() const"> + <modify-function signature="outputDevice()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -65,7 +65,7 @@ <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QGraphicsSvgItem(const QString&, QGraphicsItem*)"> + <modify-function signature="QGraphicsSvgItem(const QString&,QGraphicsItem*)"> <modify-argument index="this"> <parent index="2" action="add"/> </modify-argument> diff --git a/sources/pyside2/PySide2/QtTest/typesystem_test.xml b/sources/pyside2/PySide2/QtTest/typesystem_test.xml index da26370a1..6b653d924 100644 --- a/sources/pyside2/PySide2/QtTest/typesystem_test.xml +++ b/sources/pyside2/PySide2/QtTest/typesystem_test.xml @@ -80,7 +80,7 @@ <rejection class="QTest" function-name="compare_helper"/> <rejection class="QTest" function-name="toPrettyUnicode"/> - + <rejection class="QTest" field-name="lastMouseButton"/> <rejection class="QTest" field-name="lastMouseTimestamp"/> @@ -89,8 +89,8 @@ 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*,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: 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 @@ -115,32 +115,32 @@ <rejection class="QTouchEventSequence"/> <object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" since="4.6" > - <modify-function signature="press(int, const QPoint&, QWidget*)"> + <modify-function signature="press(int,const QPoint&,QWidget*)"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="press(int, const QPoint&, QWindow*)"> + <modify-function signature="press(int,const QPoint&,QWindow*)"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="move(int, const QPoint&, QWidget*)"> + <modify-function signature="move(int,const QPoint&,QWidget*)"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="move(int, const QPoint&, QWindow*)"> + <modify-function signature="move(int,const QPoint&,QWindow*)"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="release(int, const QPoint&, QWidget*)"> + <modify-function signature="release(int,const QPoint&,QWidget*)"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="release(int, const QPoint&, QWindow*)"> + <modify-function signature="release(int,const QPoint&,QWindow*)"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -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*,QTouchDevice*,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*,QTouchDevice*,bool)" rename="touchEvent" since="4.6"> <modify-argument index="return"> <define-ownership class="target" owner="target"/> </modify-argument> diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml index f6dd0333b..f18b8e818 100644 --- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml +++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml @@ -92,32 +92,32 @@ %CPPSELF.addPluginPath(""); // force reload widgets </inject-code> </add-function> - <modify-function signature="createAction(QObject*, const QString&)"> + <modify-function signature="createAction(QObject*,const QString&)"> <modify-argument index="return"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="createActionGroup(QObject*, const QString&)"> + <modify-function signature="createActionGroup(QObject*,const QString&)"> <modify-argument index="return"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="createLayout(const QString&, QObject*, const QString&)"> + <modify-function signature="createLayout(const QString&,QObject*,const QString&)"> <modify-argument index="return"> <parent index="2" action="add"/> </modify-argument> </modify-function> - <modify-function signature="createWidget(const QString&, QWidget*, const QString&)"> + <modify-function signature="createWidget(const QString&,QWidget*,const QString&)"> <modify-argument index="return"> <parent index="2" action="add"/> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="load(QIODevice*, QWidget*)"> + <modify-function signature="load(QIODevice*,QWidget*)"> <modify-argument index="2"> <replace-default-expression with="0" /> <rename to="parentWidget" /> @@ -132,7 +132,7 @@ </modify-function> <!-- Syntax sugar --> - <add-function signature="load(QString, QWidget*)" return-type="QWidget*"> + <add-function signature="load(QString,QWidget*)" return-type="QWidget*"> <modify-argument index="2"> <replace-default-expression with="0" /> <rename to="parentWidget" /> diff --git a/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt new file mode 100644 index 000000000..109b9f208 --- /dev/null +++ b/sources/pyside2/PySide2/QtWebEngineCore/CMakeLists.txt @@ -0,0 +1,37 @@ +project(QtWebEngineCore) + +set(QtWebEngineCore_SRC +${QtWebEngineCore_GEN_DIR}/qwebenginecookiestore_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebenginehttprequest_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinfo_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestinterceptor_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlrequestjob_wrapper.cpp +${QtWebEngineCore_GEN_DIR}/qwebengineurlschemehandler_wrapper.cpp +# module is always needed +${QtWebEngineCore_GEN_DIR}/qtwebenginecore_module_wrapper.cpp +) + +set(QtWebEngineCore_include_dirs + ${QtWebEngineCore_SOURCE_DIR} + ${QtWebEngineCore_BINARY_DIR} + ${Qt5Core_INCLUDE_DIRS} + ${SHIBOKEN_INCLUDE_DIR} + ${libpyside_SOURCE_DIR} + ${SHIBOKEN_PYTHON_INCLUDE_DIR} + ${QtCore_GEN_DIR} + ) +set(QtWebEngineCore_libraries pyside2 + ${SHIBOKEN_PYTHON_LIBRARIES} + ${SHIBOKEN_LIBRARY} + ${Qt5WebEngineCore_LIBRARIES} + ${Qt5Core_LIBRARIES} + ) +set(QtWebEngineCore_deps QtCore) +create_pyside_module(QtWebEngineCore + QtWebEngineCore_include_dirs + QtWebEngineCore_libraries + QtWebEngineCore_deps + QtWebEngineCore_SOURCE_DIR + QtWebEngineCore_SRC + "") + diff --git a/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml new file mode 100644 index 000000000..5fb064ccb --- /dev/null +++ b/sources/pyside2/PySide2/QtWebEngineCore/typesystem_webenginecore.xml @@ -0,0 +1,69 @@ +<?xml version="1.0"?> +<!-- +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of PySide2. +** +** $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.QtWebEngineCore"> + <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> + + <object-type name="QWebEngineCookieStore"/> + + <object-type name="QWebEngineHttpRequest"> + <enum-type name="Method"/> + <modify-function signature="QWebEngineHttpRequest(const QUrl &, const QWebEngineHttpRequest::Method &)"> + <modify-argument index="2"> + <replace-type modified-type="QWebEngineHttpRequest::Method"/> + </modify-argument> + </modify-function> + </object-type> + + <object-type name="QWebEngineUrlRequestInfo"> + <enum-type name="NavigationType"/> + <enum-type name="ResourceType"/> + </object-type> + + <object-type name="QWebEngineUrlRequestInterceptor"/> + + <object-type name="QWebEngineUrlRequestJob"> + <enum-type name="Error"/> + </object-type> + + <object-type name="QWebEngineUrlSchemeHandler"/> + +</typesystem> diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt index 32d0643c8..f04394de9 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/CMakeLists.txt @@ -33,6 +33,7 @@ set(QtWebEngineWidgets_include_dirs ${QtWebEngineWidgets_GEN_DIR} ${QtNetwork_GEN_DIR} ${QtWebChannel_GEN_DIR} + ${QtWebEngineCore_GEN_DIR} ) set(QtWebEngineWidgets_libraries pyside2 ${SHIBOKEN_PYTHON_LIBRARIES} diff --git a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml index 9462c3e41..41c8afcfe 100644 --- a/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml +++ b/sources/pyside2/PySide2/QtWebEngineWidgets/typesystem_webenginewidgets.xml @@ -45,6 +45,7 @@ <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <load-typesystem name="QtWebChannel/typesystem_webchannel.xml" generate="no"/> + <load-typesystem name="QtWebEngineCore/typesystem_webenginecore.xml" generate="no"/> <object-type name="QWebEngineCertificateError"> @@ -53,6 +54,7 @@ <object-type name="QWebEngineDownloadItem"> <enum-type name="DownloadState" /> + <enum-type name="SavePageFormat"/> </object-type> <!-- TODO: Deal with private constructor diff --git a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml index 0f8d8da4e..3f51bedbf 100644 --- a/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml +++ b/sources/pyside2/PySide2/QtWebKitWidgets/typesystem_webkitwidgets.xml @@ -53,7 +53,7 @@ <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-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"/> @@ -83,7 +83,7 @@ <reference-count action="set"/> </modify-argument> </modify-function> - <modify-function signature="page() const"> + <modify-function signature="page()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -162,7 +162,7 @@ <value-type name="ExtensionReturn" /> <value-type name="ViewportAttributes" /> - <modify-function signature="extension(QWebPage::Extension, const QWebPage::ExtensionOption*, QWebPage::ExtensionReturn*)"> + <modify-function signature="extension(QWebPage::Extension,const QWebPage::ExtensionOption*,QWebPage::ExtensionReturn*)"> <template name="qwebpage_extension_argument_conversion"> PyObject* %out = 0; // Cast the parameters according to the extension type diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml index 0555d9a53..98ffb2af7 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml @@ -201,7 +201,7 @@ <value-type name="QTableWidgetSelectionRange"/> <value-type name="QTreeWidgetItemIterator" > - <modify-function signature="QTreeWidgetItemIterator(QTreeWidget *, QFlags<QTreeWidgetItemIterator::IteratorFlag>)"> + <modify-function signature="QTreeWidgetItemIterator(QTreeWidget*,QFlags<QTreeWidgetItemIterator::IteratorFlag>)"> <modify-argument index="this"> <parent index="1" action="add" /> </modify-argument> @@ -270,7 +270,7 @@ PyObject *userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType); PyDict_SetItemString(Sbk_QGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant); </inject-code> - <modify-function signature="setParentItem(QGraphicsItem *)"> + <modify-function signature="setParentItem(QGraphicsItem*)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> @@ -282,7 +282,7 @@ Shiboken::Object::setParent(pyParent, %PYARG_0); } </template> - <modify-function signature="scene() const"> + <modify-function signature="scene()const"> <inject-code position="end"> <insert-template name="scene_return_parenting"/> </inject-code> @@ -291,7 +291,7 @@ </modify-argument> </modify-function> - <modify-function signature="parentItem() const"> + <modify-function signature="parentItem()const"> <modify-argument index="return"> <define-ownership owner="target"/> </modify-argument> @@ -299,7 +299,7 @@ <parent index="return" action="add"/> </modify-argument> </modify-function> - <modify-function signature="parentWidget() const"> + <modify-function signature="parentWidget()const"> <modify-argument index="this"> <parent index="return" action="add"/> </modify-argument> @@ -435,12 +435,12 @@ <reference-count action="set"/> </modify-argument> </modify-function> - <modify-function signature="setItemDelegateForColumn(int, QAbstractItemDelegate*)"> + <modify-function signature="setItemDelegateForColumn(int,QAbstractItemDelegate*)"> <modify-argument index="2"> <reference-count action="set"/> </modify-argument> </modify-function> - <modify-function signature="setItemDelegateForRow(int, QAbstractItemDelegate*)"> + <modify-function signature="setItemDelegateForRow(int,QAbstractItemDelegate*)"> <modify-argument index="2"> <reference-count action="set"/> </modify-argument> @@ -450,21 +450,21 @@ <replace-default-expression with="QStyleOptionViewItem()" /> </modify-argument> </modify-function> - <modify-function signature="model() const"> + <modify-function signature="model()const"> <modify-argument index="return"> <!-- Defining ownership as "default" avoids the object to be automatically set as parent of the returned pointer. --> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="selectionModel() const"> + <modify-function signature="selectionModel()const"> <modify-argument index="return"> <!-- Defining ownership as "default" avoids the object to be automatically set as parent of the returned pointer. --> <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="setIndexWidget(const QModelIndex &, QWidget *)"> + <modify-function signature="setIndexWidget(const QModelIndex &,QWidget*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -672,12 +672,12 @@ </modify-function> </object-type> <object-type name="QItemEditorCreatorBase"> - <modify-function signature="createWidget(QWidget *) const"> + <modify-function signature="createWidget(QWidget*)const"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> </object-type> <object-type name="QItemEditorFactory"> - <modify-function signature="registerEditor(int, QItemEditorCreatorBase *)"> + <modify-function signature="registerEditor(int,QItemEditorCreatorBase*)"> <modify-argument index="2"> <reference-count action="set"/> </modify-argument> @@ -685,7 +685,7 @@ Shiboken::Object::releaseOwnership(%PYARG_2); </inject-code> </modify-function> - <modify-function signature="setDefaultFactory(QItemEditorFactory *)"> + <modify-function signature="setDefaultFactory(QItemEditorFactory*)"> <modify-argument index="1"> <define-ownership owner="c++"/> </modify-argument> @@ -761,7 +761,7 @@ </inject-code> </modify-function> - <modify-function signature="addDockWidget(Qt::DockWidgetArea, QDockWidget*)"> + <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -772,7 +772,7 @@ </modify-argument> </modify-function> <!-- this fuction is declared when not defined QT_NO_TOOLBA --> - <modify-function signature="addToolBar(Qt::ToolBarArea, QToolBar*)"> + <modify-function signature="addToolBar(Qt::ToolBarArea,QToolBar*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -809,7 +809,7 @@ <enum-type name="AreaOption" flags="AreaOptions"/> <enum-type name="ViewMode"/> <enum-type name="WindowOrder"/> - <modify-function signature="addSubWindow(QWidget*, QFlags<Qt::WindowType>)" > + <modify-function signature="addSubWindow(QWidget*,QFlags<Qt::WindowType>)" > <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -835,8 +835,8 @@ <inject-code class="native" position="beginning" file="glue/qmenu_glue.cpp"/> <modify-function signature="exec()" rename="exec_" allow-thread="yes" /> - <modify-function signature="exec(const QPoint&, QAction*)" rename="exec_" allow-thread="yes" /> - <modify-function signature="exec(QList<QAction*>, const QPoint&, QAction*, QWidget*)" rename="exec_" allow-thread="yes" /> + <modify-function signature="exec(const QPoint&,QAction*)" rename="exec_" allow-thread="yes" /> + <modify-function signature="exec(QList<QAction*>,const QPoint&,QAction*,QWidget*)" rename="exec_" allow-thread="yes" /> <modify-function signature="addAction(const QString&)"> <modify-argument index="return"> <parent index="this" action="add"/> @@ -855,7 +855,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addMenu(const QIcon &, const QString &)"> + <modify-function signature="addMenu(const QIcon &,const QString &)"> <modify-argument index="return"> <parent index="this" action="add"/> </modify-argument> @@ -873,7 +873,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addMenu(const QIcon &, const QString &)"> + <modify-function signature="addMenu(const QIcon &,const QString &)"> <modify-argument index="return"> <parent index="this" action="add"/> </modify-argument> @@ -881,7 +881,7 @@ <!-- ### "setNoReplayFor(QWidget*)" is an internal method. --> <modify-function signature="setNoReplayFor(QWidget*)" remove="all" /> - <add-function signature="addAction(QString&, PyObject*, QKeySequence&)"> + <add-function signature="addAction(QString&,PyObject*,QKeySequence&)"> <modify-argument index="3"> <replace-default-expression with="0" /> </modify-argument> @@ -894,7 +894,7 @@ </inject-code> </add-function> - <add-function signature="addAction(QIcon&, QString&, PyObject*, QKeySequence&)"> + <add-function signature="addAction(QIcon&,QString&,PyObject*,QKeySequence&)"> <modify-argument index="4"> <replace-default-expression with="0" /> </modify-argument> @@ -942,7 +942,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <add-function signature="addAction(const QString&, PyObject*)"> + <add-function signature="addAction(const QString&,PyObject*)"> <inject-code class="target" position="beginning"> %PYARG_0 = addActionWithPyObject(%CPPSELF, %1, %2); </inject-code> @@ -1006,7 +1006,7 @@ </object-type> <object-type name="QShortcut"> - <add-function signature="QShortcut(QKeySequence&, QWidget*, PyCallable*, Qt::ShortcutContext)"> + <add-function signature="QShortcut(QKeySequence&,QWidget*,PyCallable*,Qt::ShortcutContext)"> <modify-argument index="4"> <replace-default-expression with="Qt::WindowShortcut"/> </modify-argument> @@ -1022,22 +1022,22 @@ </object-type> <object-type name="QSpacerItem"/> <object-type name="QStatusBar"> - <modify-function signature="addWidget(QWidget*, int)"> + <modify-function signature="addWidget(QWidget*,int)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addPermanentWidget(QWidget*, int)"> + <modify-function signature="addPermanentWidget(QWidget*,int)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertWidget(int, QWidget*, int)"> + <modify-function signature="insertWidget(int,QWidget*,int)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertPermanentWidget(int, QWidget*, int)"> + <modify-function signature="insertPermanentWidget(int,QWidget*,int)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -1078,22 +1078,22 @@ </object-type> <object-type name="QTimeEdit"/> <object-type name="QToolBox"> - <modify-function signature="addItem(QWidget*, const QIcon&, const QString&)"> + <modify-function signature="addItem(QWidget*,const QIcon&,const QString&)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addItem(QWidget*, const QString&)"> + <modify-function signature="addItem(QWidget*,const QString&)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertItem(int, QWidget*, const QIcon&, const QString&)"> + <modify-function signature="insertItem(int,QWidget*,const QIcon&,const QString&)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertItem(int, QWidget*, const QString&)"> + <modify-function signature="insertItem(int,QWidget*,const QString&)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -1110,12 +1110,12 @@ </object-type> <object-type name="QToolButton"> <enum-type name="ToolButtonPopupMode"/> - <modify-function signature="setDefaultAction(QAction *)"> + <modify-function signature="setDefaultAction(QAction*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setMenu(QMenu *)"> + <modify-function signature="setMenu(QMenu*)"> </modify-function> </object-type> <object-type name="QToolTip"/> @@ -1126,6 +1126,11 @@ <modify-function signature="drawRow(QPainter*,QStyleOptionViewItem,QModelIndex)const"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> + <modify-function signature="setHeader(QHeaderView*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> </object-type> <object-type name="QUndoCommand"> <modify-function signature="mergeWith(const QUndoCommand*)"> @@ -1145,12 +1150,12 @@ </modify-function> </object-type> <object-type name="QUndoStack"> - <modify-function signature="createUndoAction(QObject*, const QString&)const"> + <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-function signature="createRedoAction(QObject*,const QString&)const"> <modify-argument index="return"> <parent index="1" action="add"/> </modify-argument> @@ -1162,22 +1167,22 @@ </modify-function> </object-type> <object-type name="QUndoView"> - <modify-function signature="setGroup(QUndoGroup *)"> + <modify-function signature="setGroup(QUndoGroup*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setStack(QUndoStack *)"> + <modify-function signature="setStack(QUndoStack*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QUndoView(QUndoGroup *,QWidget *)"> + <modify-function signature="QUndoView(QUndoGroup*,QWidget*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QUndoView(QUndoStack *,QWidget *)"> + <modify-function signature="QUndoView(QUndoStack*,QWidget*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -1205,14 +1210,14 @@ </object-type> <object-type name="QGraphicsSceneDragDropEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneDragEnter || %1->type() == QEvent::GraphicsSceneDragLeave || %1->type() == QEvent::GraphicsSceneDragMove || %1->type() == QEvent::GraphicsSceneDrop" > <!-- ### "setMimeData(const QMimeData*)" is an internal method. --> - <modify-function signature="setMimeData(const QMimeData *)" remove="all"/> + <modify-function signature="setMimeData(const QMimeData*)" remove="all"/> <!-- ### "setSource(QWidget*)" is an internal method. --> - <modify-function signature="setSource(QWidget *)" remove="all"/> + <modify-function signature="setSource(QWidget*)" remove="all"/> <!-- ### --> </object-type> <object-type name="QGraphicsSceneEvent" copyable="false"> <!-- ### "setWidget(QWidget*)" is an internal method. --> - <modify-function signature="setWidget(QWidget *)" remove="all"/> + <modify-function signature="setWidget(QWidget*)" remove="all"/> </object-type> <object-type name="QGraphicsSceneMoveEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneMove" /> <object-type name="QGraphicsSceneResizeEvent" copyable="false" polymorphic-id-expression="%1->type() == QEvent::GraphicsSceneResize" /> @@ -1282,7 +1287,7 @@ <rename to="widget" /> </modify-argument> </modify-function> - <modify-function signature="hitTestComplexControl(QStyle::ComplexControl, const QStyleOptionComplex*, const QPoint&, const QWidget*)const"> + <modify-function signature="hitTestComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,const QPoint&,const QWidget*)const"> <modify-argument index="4"> <replace-default-expression with="0"/> <rename to="widget" /> @@ -1300,9 +1305,9 @@ </object-type> <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" /> + <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" /> + <modify-function signature="getRgba(unsigned int,bool*,QWidget*)" remove="all" /> </object-type> <object-type name="QLayout"> @@ -1351,12 +1356,12 @@ </inject-code> </modify-function> - <modify-function signature="addWidget(QWidget *)"> + <modify-function signature="addWidget(QWidget*)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="addChildWidget(QWidget *)"> + <modify-function signature="addChildWidget(QWidget*)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %1); </inject-code> @@ -1423,29 +1428,29 @@ <enum-type name="Direction" /> - <modify-function signature="addWidget(QWidget *, int, QFlags<Qt::AlignmentFlag>)"> + <modify-function signature="addWidget(QWidget*,int,QFlags<Qt::AlignmentFlag>)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="addLayout(QLayout *, int)"> + <modify-function signature="addLayout(QLayout*,int)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="insertWidget(int, QWidget *, int, QFlags<Qt::AlignmentFlag>)"> + <modify-function signature="insertWidget(int,QWidget*,int,QFlags<Qt::AlignmentFlag>)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %2); </inject-code> </modify-function> - <modify-function signature="insertLayout(int, QLayout *, int)"> + <modify-function signature="insertLayout(int,QLayout*,int)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %2); </inject-code> </modify-function> - <modify-function signature="insertItem(int, QLayoutItem *)"> + <modify-function signature="insertItem(int,QLayoutItem*)"> <inject-code class="target" position="beginning"> addLayoutOwnership(%CPPSELF, %2); </inject-code> @@ -1464,7 +1469,7 @@ <object-type name="QGridLayout"> <inject-code class="native" position="beginning" file="glue/qlayout_help_functions.cpp"/> - <modify-function signature="itemAtPosition (int, int) const"> + <modify-function signature="itemAtPosition (int,int)const"> <modify-argument index="return"> <define-ownership owner="default"/> </modify-argument> @@ -1472,7 +1477,7 @@ addLayoutOwnership(%CPPSELF, %0); </inject-code> </modify-function> - <modify-function signature="addWidget(QWidget *, int, int, QFlags<Qt::AlignmentFlag>)"> + <modify-function signature="addWidget(QWidget*,int,int,QFlags<Qt::AlignmentFlag>)"> <modify-argument index="4"> <rename to="alignment"/> </modify-argument> @@ -1480,7 +1485,7 @@ addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="addWidget(QWidget *, int, int, int, int, QFlags<Qt::AlignmentFlag>)"> + <modify-function signature="addWidget(QWidget*,int,int,int,int,QFlags<Qt::AlignmentFlag>)"> <modify-argument index="6"> <rename to="alignment"/> </modify-argument> @@ -1488,7 +1493,7 @@ addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="addLayout(QLayout *, int, int, QFlags<Qt::AlignmentFlag>)"> + <modify-function signature="addLayout(QLayout*,int,int,QFlags<Qt::AlignmentFlag>)"> <modify-argument index="4"> <rename to="alignment"/> </modify-argument> @@ -1496,7 +1501,7 @@ addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="addLayout(QLayout *, int, int, int, int, QFlags<Qt::AlignmentFlag>)"> + <modify-function signature="addLayout(QLayout*,int,int,int,int,QFlags<Qt::AlignmentFlag>)"> <modify-argument index="6"> <rename to="alignment"/> </modify-argument> @@ -1504,7 +1509,7 @@ addLayoutOwnership(%CPPSELF, %1); </inject-code> </modify-function> - <modify-function signature="addItem(QLayoutItem *, int, int, int, int, QFlags<Qt::AlignmentFlag>)"> + <modify-function signature="addItem(QLayoutItem*,int,int,int,int,QFlags<Qt::AlignmentFlag>)"> <modify-argument index="4"> <rename to="rowSpan"/> </modify-argument> @@ -1557,7 +1562,7 @@ <enum-type name="OptimizationFlag" flags="OptimizationFlags"/> <enum-type name="ViewportAnchor"/> <enum-type name="ViewportUpdateMode"/> - <modify-function signature="setupViewport(QWidget *)" access="non-final"/> + <modify-function signature="setupViewport(QWidget*)" access="non-final"/> <modify-function signature="setScene(QGraphicsScene*)"> <modify-argument index="1"> <reference-count action="set"/> @@ -1589,7 +1594,7 @@ </modify-function> <!-- TODO: Support conversions on virtual function --> - <modify-function signature="drawItems(QPainter*, int, QGraphicsItem*[], const QStyleOptionGraphicsItem[])"> + <modify-function signature="drawItems(QPainter*,int,QGraphicsItem*[],const QStyleOptionGraphicsItem[])"> <modify-argument index="2"> <remove-argument/> <conversion-rule class="native"> @@ -1642,7 +1647,7 @@ <enum-type name="InputDialogOption"/> <enum-type name="InputMode"/> - <modify-function signature="getInt(QWidget*, const QString&, const QString&, int, int, int, int, bool*, QFlags<Qt::WindowType>)" allow-thread="yes"> + <modify-function signature="getInt(QWidget*,const QString&,const QString&,int,int,int,int,bool*,QFlags<Qt::WindowType>)" allow-thread="yes"> <modify-argument index="8"> <remove-default-expression/> <remove-argument/> @@ -1652,7 +1657,7 @@ </inject-code> </modify-function> - <modify-function signature="getItem(QWidget*, const QString&, const QString&, const QStringList&, int, bool, bool*, QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> + <modify-function signature="getItem(QWidget*,const QString&,const QString&,const QStringList&,int,bool,bool*,QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> <modify-argument index="7"> <remove-default-expression/> <remove-argument/> @@ -1662,7 +1667,7 @@ </inject-code> </modify-function> - <modify-function signature="getMultiLineText(QWidget*, const QString&, const QString&, const QString&, bool*, QFlags<Qt::WindowType>, QFlags<Qt::InputMethodHint>)" allow-thread="yes"> + <modify-function signature="getMultiLineText(QWidget*,const QString&,const QString&,const QString&,bool*,QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> <modify-argument index="5"> <remove-default-expression/> <remove-argument/> @@ -1672,7 +1677,7 @@ </inject-code> </modify-function> - <modify-function signature="getText(QWidget*, const QString&, const QString&, QLineEdit::EchoMode, const QString&, bool*, QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> + <modify-function signature="getText(QWidget*,const QString&,const QString&,QLineEdit::EchoMode,const QString&,bool*,QFlags<Qt::WindowType>,QFlags<Qt::InputMethodHint>)" allow-thread="yes"> <modify-argument index="6"> <remove-default-expression/> <remove-argument/> @@ -1682,7 +1687,7 @@ </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-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/> @@ -1786,29 +1791,29 @@ </modify-argument> </modify-function> - <modify-function signature="addEllipse(const QRectF&, const QPen&, const QBrush&)"> + <modify-function signature="addEllipse(const QRectF&,const QPen&,const QBrush&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addEllipse(qreal, qreal, qreal, qreal, const QPen&, const QBrush&)"> + <modify-function signature="addEllipse(qreal,qreal,qreal,qreal,const QPen&,const QBrush&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addLine(const QLineF&, const QPen&)"> + <modify-function signature="addLine(const QLineF&,const QPen&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addLine(qreal, qreal, qreal, qreal, const QPen&)"> + <modify-function signature="addLine(qreal,qreal,qreal,qreal,const QPen&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addPath(const QPainterPath&, const QPen&, const QBrush&)"> + <modify-function signature="addPath(const QPainterPath&,const QPen&,const QBrush&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> @@ -1818,28 +1823,28 @@ <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addPolygon(const QPolygonF&, const QPen&, const QBrush&)"> + <modify-function signature="addPolygon(const QPolygonF&,const QPen&,const QBrush&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addRect(const QRectF&, const QPen&, const QBrush&)"> + <modify-function signature="addRect(const QRectF&,const QPen&,const QBrush&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addRect(qreal, qreal, qreal, qreal, const QPen&, const QBrush&)"> + <modify-function signature="addRect(qreal,qreal,qreal,qreal,const QPen&,const QBrush&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addText(const QString&, const QFont&)"> + <modify-function signature="addText(const QString&,const QFont&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> </modify-function> - <modify-function signature="addSimpleText(const QString&, const QFont&)"> + <modify-function signature="addSimpleText(const QString&,const QFont&)"> <modify-argument index="return"> <parent index="this" action="add" /> </modify-argument> @@ -1855,7 +1860,7 @@ </modify-function> <!-- use glue code --> - <modify-function signature="drawItems(QPainter*, int, QGraphicsItem**, const QStyleOptionGraphicsItem*, QWidget *)"> + <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*,QWidget*)"> <modify-argument index="2"> <remove-argument/> </modify-argument> @@ -1902,10 +1907,15 @@ </modify-function> </object-type> <object-type name="QTreeWidget"> + <modify-function signature="setItemWidget(QTreeWidgetItem*,int,QWidget*)"> + <modify-argument index="3"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="addTopLevelItem(QTreeWidgetItem *)"> + <modify-function signature="addTopLevelItem(QTreeWidgetItem*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -1920,12 +1930,12 @@ <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)"> + <modify-function signature="insertTopLevelItem(int,QTreeWidgetItem*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertTopLevelItems(int, const QList<QTreeWidgetItem*> &)"> + <modify-function signature="insertTopLevelItems(int,const QList<QTreeWidgetItem*> &)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -1982,22 +1992,22 @@ </object-type> <object-type name="QListWidgetItem" > <enum-type name="ItemType"/> - <modify-function signature="QListWidgetItem(const QString&, QListWidget*, int)"> + <modify-function signature="QListWidgetItem(const QString&,QListWidget*,int)"> <modify-argument index="this"> <parent index="2" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QListWidgetItem(const QIcon&, const QString&, QListWidget*, int)"> + <modify-function signature="QListWidgetItem(const QIcon&,const QString&,QListWidget*,int)"> <modify-argument index="this"> <parent index="3" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QListWidgetItem(QListWidget*, int)"> + <modify-function signature="QListWidgetItem(QListWidget*,int)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="listWidget() const"> + <modify-function signature="listWidget()const"> <modify-argument index="return"> <define-ownership owner="target"/> </modify-argument> @@ -2048,37 +2058,37 @@ <modify-function signature="write(QDataStream&)const"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidget*, int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidget*,int)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidget*, const QStringList&, int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidget*,const QStringList&,int)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidget*, QTreeWidgetItem*, int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidget*,QTreeWidgetItem*,int)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*,int)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*, const QStringList &, int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*,const QStringList &,int)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*, QTreeWidgetItem*, int)"> + <modify-function signature="QTreeWidgetItem(QTreeWidgetItem*,QTreeWidgetItem*,int)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addChild(QTreeWidgetItem *)"> + <modify-function signature="addChild(QTreeWidgetItem*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -2088,12 +2098,12 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertChild(int, QTreeWidgetItem *)"> + <modify-function signature="insertChild(int,QTreeWidgetItem*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertChildren(int, const QList<QTreeWidgetItem*> &)"> + <modify-function signature="insertChildren(int,const QList<QTreeWidgetItem*> &)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -2113,7 +2123,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="parent() const"> + <modify-function signature="parent()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -2124,7 +2134,7 @@ Shiboken::Object::setParent(%PYARG_0, %PYSELF); </inject-code> </modify-function> - <modify-function signature="treeWidget() const"> + <modify-function signature="treeWidget()const"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> </modify-argument> @@ -2138,7 +2148,7 @@ </object-type> <object-type name="QListWidget"> - <modify-function signature="setItemWidget(QListWidgetItem *, QWidget *)"> + <modify-function signature="setItemWidget(QListWidgetItem*,QWidget*)"> <modify-argument index="2"> <parent index="1" action="add"/> </modify-argument> @@ -2148,7 +2158,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertItem(int, QListWidgetItem*)"> + <modify-function signature="insertItem(int,QListWidgetItem*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -2179,7 +2189,7 @@ <object-type name="QWidget"> <!-- Qt5: remove native event for now --> - <modify-function signature="nativeEvent(const QByteArray &, void *, long *)" remove="all" /> + <modify-function signature="nativeEvent(const QByteArray &,void*,long*)" remove="all" /> <extra-includes> <include file-name="QIcon" location="global"/> @@ -2196,7 +2206,7 @@ </modify-argument> </modify-function> - <modify-function signature="setParent(QWidget*, QFlags<Qt::WindowType>)"> + <modify-function signature="setParent(QWidget*,QFlags<Qt::WindowType>)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> @@ -2406,20 +2416,20 @@ </insert-template> </inject-code> </modify-function> - <modify-function signature="insertAction(QAction*, QAction*)"> + <modify-function signature="insertAction(QAction*,QAction*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setLayout(QLayout *)"> + <modify-function signature="setLayout(QLayout*)"> <inject-code class="target" position="beginning"> qwidgetSetLayout(%CPPSELF, %1); // %FUNCTION_NAME() - disable generation of function call. </inject-code> </modify-function> <modify-function signature="raise()" rename="raise_" /> - <modify-function signature="setParent(QWidget*, QFlags<Qt::WindowType>)"> + <modify-function signature="setParent(QWidget*,QFlags<Qt::WindowType>)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> @@ -2445,26 +2455,26 @@ <include file-name="QPixmap" location="global"/> </extra-includes> - <modify-function signature="critical(QWidget*, const QString&, const QString&, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)" allow-thread="yes"/> - <modify-function signature="information(QWidget*, const QString&, const QString&, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)" allow-thread="yes"/> - <modify-function signature="question(QWidget*, const QString&, const QString&, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)" allow-thread="yes"/> - <modify-function signature="warning(QWidget*, const QString&, const QString&, QFlags<QMessageBox::StandardButton>, QMessageBox::StandardButton)" allow-thread="yes"/> - <modify-function signature="QMessageBox(const QString&, const QString&, QMessageBox::Icon, int, int, int, QWidget*, QFlags<Qt::WindowType>)" remove="all"/> - <modify-function signature="critical(QWidget*, const QString&, const QString&, int, int, int)" remove="all"/> - <modify-function signature="critical(QWidget*, const QString&, const QString&, const QString&, const QString&, const QString&, int, int)" remove="all"/> - <modify-function signature="information(QWidget*, const QString&, const QString&, int, int, int)" remove="all"/> - <modify-function signature="information(QWidget*, const QString&, const QString&, const QString&, const QString&, const QString&, int, int)" remove="all"/> - <modify-function signature="question(QWidget*, const QString&, const QString&, int, int, int)" remove="all"/> - <modify-function signature="question(QWidget*, const QString&, const QString&, const QString&, const QString&, const QString&, int, int)" remove="all"/> - <modify-function signature="warning(QWidget*, const QString&, const QString&, int, int, int)" remove="all"/> - <modify-function signature="warning(QWidget*, const QString&, const QString&, const QString&, const QString&, const QString&, int, int)" remove="all"/> + <modify-function signature="critical(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="information(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="question(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="warning(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="QMessageBox(const QString&,const QString&,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> + <modify-function signature="critical(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> + <modify-function signature="critical(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> + <modify-function signature="information(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> + <modify-function signature="information(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> + <modify-function signature="question(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> + <modify-function signature="question(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> + <modify-function signature="warning(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> + <modify-function signature="warning(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> </object-type> <object-type name="QAbstractSpinBox"> <enum-type name="ButtonSymbols"/> <enum-type name="CorrectionMode"/> <enum-type name="StepEnabledFlag" flags="StepEnabled"/> - <modify-function signature="setLineEdit(QLineEdit *)"> + <modify-function signature="setLineEdit(QLineEdit*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -2477,7 +2487,7 @@ <insert-template name="return_QString"/> </inject-code> </modify-function> - <modify-function signature="validate(QString &, int &)const"> + <modify-function signature="validate(QString &,int &)const"> <modify-argument index="return"> <replace-type modified-type="PyObject"/> <conversion-rule class="native"> @@ -2493,27 +2503,27 @@ <object-type name="QTabWidget"> <enum-type name="TabPosition"/> <enum-type name="TabShape"/> - <modify-function signature="addTab(QWidget*, const QString&)"> + <modify-function signature="addTab(QWidget*,const QString&)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addTab(QWidget*, const QIcon&, const QString&)"> + <modify-function signature="addTab(QWidget*,const QIcon&,const QString&)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertTab(int, QWidget*, const QIcon&, const QString&)"> + <modify-function signature="insertTab(int,QWidget*,const QIcon&,const QString&)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertTab(int, QWidget*, const QString&)"> + <modify-function signature="insertTab(int,QWidget*,const QString&)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setCornerWidget(QWidget*, Qt::Corner)"> + <modify-function signature="setCornerWidget(QWidget*,Qt::Corner)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -2577,13 +2587,13 @@ </modify-function> </object-type> <object-type name="QLabel"> - <modify-function signature="setBuddy(QWidget *)"> + <modify-function signature="setBuddy(QWidget*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setMovie(QMovie *)"> + <modify-function signature="setMovie(QMovie*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -2611,9 +2621,9 @@ </modify-argument> </modify-function> - <modify-function signature="getExistingDirectory(QWidget*, const QString&, const QString&, QFlags<QFileDialog::Option>)" allow-thread="yes" /> - <modify-function signature="getExistingDirectoryUrl(QWidget*, const QString&, const QUrl&, QFlags<QFileDialog::Option>, const QStringList&)" /> - <modify-function signature="getOpenFileName(QWidget*, const QString&, const QString&, const QString&, QString*, QFlags<QFileDialog::Option>)" allow-thread="yes"> + <modify-function signature="getExistingDirectory(QWidget*,const QString&,const QString&,QFlags<QFileDialog::Option>)" allow-thread="yes" /> + <modify-function signature="getExistingDirectoryUrl(QWidget*,const QString&,const QUrl&,QFlags<QFileDialog::Option>,const QStringList&)" /> + <modify-function signature="getOpenFileName(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> <modify-argument index="return"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> @@ -2625,7 +2635,7 @@ <insert-template name="return_for_QFileDialog"/> </inject-code> </modify-function> - <modify-function signature="getOpenFileNames(QWidget*, const QString&, const QString&, const QString&, QString*, QFlags<QFileDialog::Option>)" allow-thread="yes"> + <modify-function signature="getOpenFileNames(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> <modify-argument index="return"> <replace-type modified-type="(fileNames, selectedFilter)"/> </modify-argument> @@ -2638,7 +2648,7 @@ </inject-code> </modify-function> - <modify-function signature="getOpenFileUrl(QWidget*, const QString&, const QUrl&, const QString&, QString*, QFlags<QFileDialog::Option>, const QStringList&)" allow-thread="yes"> + <modify-function signature="getOpenFileUrl(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> <modify-argument index="return"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> @@ -2651,7 +2661,7 @@ </inject-code> </modify-function> - <modify-function signature="getOpenFileUrls(QWidget*, const QString&, const QUrl&, const QString&, QString *, QFlags<QFileDialog::Option>, const QStringList&)" allow-thread="yes"> + <modify-function signature="getOpenFileUrls(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> <modify-argument index="return"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> @@ -2664,7 +2674,7 @@ </inject-code> </modify-function> - <modify-function signature="getSaveFileName(QWidget*, const QString&, const QString&, const QString&, QString*, QFlags<QFileDialog::Option>)" allow-thread="yes"> + <modify-function signature="getSaveFileName(QWidget*,const QString&,const QString&,const QString&,QString*,QFlags<QFileDialog::Option>)" allow-thread="yes"> <modify-argument index="return"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> @@ -2677,7 +2687,7 @@ </inject-code> </modify-function> - <modify-function signature="getSaveFileUrl(QWidget*, const QString&, const QUrl&, const QString&, QString*, QFlags<QFileDialog::Option>, const QStringList&)" allow-thread="yes"> + <modify-function signature="getSaveFileUrl(QWidget*,const QString&,const QUrl&,const QString&,QString*,QFlags<QFileDialog::Option>,const QStringList&)" allow-thread="yes"> <modify-argument index="return"> <replace-type modified-type="(fileName, selectedFilter)"/> </modify-argument> @@ -2705,7 +2715,7 @@ <object-type name="QScrollBar" /> <object-type name="QAbstractScrollArea"> <enum-type name="SizeAdjustPolicy"/> - <modify-function signature="setViewport(QWidget *)"> + <modify-function signature="setViewport(QWidget*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -2746,7 +2756,7 @@ </object-type> <object-type name="QRubberBand"> <enum-type name="Shape"/> - <modify-function signature="QRubberBand(QRubberBand::Shape, QWidget*)"> + <modify-function signature="QRubberBand(QRubberBand::Shape,QWidget*)"> <modify-argument index="this"> <parent index="2" action="add"/> </modify-argument> @@ -2756,12 +2766,12 @@ </modify-function> </object-type> <object-type name="QTableWidget"> - <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)"> + <modify-function signature="setHorizontalHeaderItem(int,QTableWidgetItem*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setItem(int, int, QTableWidgetItem *)"> + <modify-function signature="setItem(int,int,QTableWidgetItem*)"> <modify-argument index="3"> <parent index="this" action="add"/> </modify-argument> @@ -2781,12 +2791,12 @@ <parent index="this" action="remove"/> </modify-argument> </modify-function> - <modify-function signature="setItemPrototype(const QTableWidgetItem *)"> + <modify-function signature="setItemPrototype(const QTableWidgetItem*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)"> + <modify-function signature="setVerticalHeaderItem(int,QTableWidgetItem*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -2824,12 +2834,12 @@ </insert-template> </inject-code> </modify-function> - <modify-function signature="addWidget(QWidget *)"> + <modify-function signature="addWidget(QWidget*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="insertWidget(int, QWidget *)"> + <modify-function signature="insertWidget(int,QWidget*)"> <modify-argument index="2"> <parent index="this" action="add"/> </modify-argument> @@ -2875,7 +2885,7 @@ </modify-argument> </modify-function> <modify-function signature="del()" rename="del_" /> - <modify-function signature="getTextMargins(int*, int*, int*, int*) const"> + <modify-function signature="getTextMargins(int*,int*,int*,int*)const"> <modify-argument index="0"> <replace-type modified-type="PyObject *" /> </modify-argument> @@ -2971,19 +2981,19 @@ <object-type name="QTextBrowser"/> <object-type name="QDoubleSpinBox"/> <object-type name="QButtonGroup"> - <modify-function signature="addButton(QAbstractButton*, int)"> + <modify-function signature="addButton(QAbstractButton*,int)"> <modify-argument index="1"> <parent index="this" action="add"/> <no-null-pointer/> </modify-argument> </modify-function> - <modify-function signature="removeButton(QAbstractButton *)"> + <modify-function signature="removeButton(QAbstractButton*)"> <modify-argument index="1"> <parent index="this" action="add"/> <no-null-pointer/> </modify-argument> </modify-function> - <modify-function signature="setId(QAbstractButton *,int)"> + <modify-function signature="setId(QAbstractButton*,int)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> @@ -3028,7 +3038,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="addAction(const QIcon&, const QString&)"> + <modify-function signature="addAction(const QIcon&,const QString&)"> <modify-argument index="return"> <parent index="this" action="add"/> </modify-argument> @@ -3104,23 +3114,23 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setItemDelegate(QAbstractItemDelegate *)"> + <modify-function signature="setItemDelegate(QAbstractItemDelegate*)"> <modify-argument index="1"> <reference-count action="set"/> <no-null-pointer/> </modify-argument> </modify-function> - <modify-function signature="setView(QAbstractItemView *)"> + <modify-function signature="setView(QAbstractItemView*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setLineEdit(QLineEdit *)"> + <modify-function signature="setLineEdit(QLineEdit*)"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="setModel(QAbstractItemModel *)"> + <modify-function signature="setModel(QAbstractItemModel*)"> <modify-argument index="1"> <no-null-pointer/> <reference-count action="set"/> @@ -3146,7 +3156,7 @@ <parent index="this" action="add"/> </modify-argument> </modify-function> - <modify-function signature="print(QPagedPaintDevice*) const" rename="print_"/> + <modify-function signature="print(QPagedPaintDevice*)const" rename="print_"/> </object-type> <object-type name="QAction"> <enum-type name="ActionEvent"/> @@ -3449,7 +3459,7 @@ </modify-function> </object-type> <object-type name="QGraphicsProxyWidget"> - <modify-function signature="QGraphicsProxyWidget(QGraphicsItem*, QFlags<Qt::WindowType>)"> + <modify-function signature="QGraphicsProxyWidget(QGraphicsItem*,QFlags<Qt::WindowType>)"> <modify-argument index="this"> <parent index="1" action="add"/> </modify-argument> @@ -3631,7 +3641,7 @@ <enum-type name="PixmapPadMode"/> </object-type> - <object-type name="QGraphicsObject" since="4.6" /> + <object-type name="QGraphicsObject" since="4.6" default-superclass="QGraphicsItem"/> <object-type name="QGraphicsOpacityEffect" since="4.6"/> <object-type name="QGraphicsRotation" since="4.6"/> <object-type name="QGraphicsScale" since="4.6"/> diff --git a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml index a2d665b0a..2dc29f815 100644 --- a/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml +++ b/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_mac.xml @@ -49,7 +49,7 @@ <enum-type name="FocusRectPolicy"/> <enum-type name="WidgetSizePolicy"/> </object-type> - --> + --> <rejection class="QWidget" function-name="macCGHandle"/> <rejection class="QWidget" function-name="macQDHandle"/> </typesystem> diff --git a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml index d78a1d77c..d5b2ec974 100644 --- a/sources/pyside2/PySide2/QtXml/typesystem_xml.xml +++ b/sources/pyside2/PySide2/QtXml/typesystem_xml.xml @@ -69,7 +69,7 @@ <value-type name="QDomDocument"> <!-- will be replaced in inject code --> - <modify-function signature="setContent(const QByteArray&, bool, QString*, int*, int*)"> + <modify-function signature="setContent(const QByteArray&,bool,QString*,int*,int*)"> <modify-argument index="3"> <remove-argument/> <remove-default-expression/> @@ -89,7 +89,7 @@ <insert-template name="qdomdocument_setcontent" /> </inject-code> </modify-function> - <modify-function signature="setContent(const QString&, bool, QString*, int*, int*)"> + <modify-function signature="setContent(const QString&,bool,QString*,int*,int*)"> <modify-argument index="3"> <remove-argument/> <remove-default-expression/> @@ -109,7 +109,7 @@ <insert-template name="qdomdocument_setcontent" /> </inject-code> </modify-function> - <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)"> + <modify-function signature="setContent(QIODevice*,bool,QString*,int*,int*)"> <modify-argument index="3"> <remove-argument/> <remove-default-expression/> @@ -129,7 +129,7 @@ <insert-template name="qdomdocument_setcontent" /> </inject-code> </modify-function> - <modify-function signature="setContent(const QByteArray&, QString*, int*, int*)"> + <modify-function signature="setContent(const QByteArray&,QString*,int*,int*)"> <modify-argument index="2"> <remove-argument/> <remove-default-expression/> @@ -209,7 +209,7 @@ <insert-template name="qdomdocument_setcontent" /> </inject-code> </modify-function> - <modify-function signature="setContent(const QString&, QString*,int*,int*)"> + <modify-function signature="setContent(const QString&,QString*,int*,int*)"> <modify-argument index="2"> <remove-argument/> <remove-default-expression/> @@ -244,7 +244,7 @@ <value-type name="QDomNode"> <enum-type name="EncodingPolicy"/> <enum-type name="NodeType"/> - <modify-function signature="save(QTextStream&, int, QDomNode::EncodingPolicy)const" allow-thread="yes"/> + <modify-function signature="save(QTextStream&,int,QDomNode::EncodingPolicy)const" allow-thread="yes"/> </value-type> <value-type name="QDomNodeList" /> @@ -281,7 +281,7 @@ </template> <object-type name="QXmlEntityResolver"> - <modify-function signature="resolveEntity(const QString&, const QString&, QXmlInputSource*&)"> + <modify-function signature="resolveEntity(const QString&,const QString&,QXmlInputSource*&)"> <modify-argument index="3"> <remove-argument/> </modify-argument> @@ -308,7 +308,7 @@ <define-ownership owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="resolveEntity(const QString&, const QString&, QXmlInputSource*&)"> + <modify-function signature="resolveEntity(const QString&,const QString&,QXmlInputSource*&)"> <modify-argument index="3"> <remove-argument/> </modify-argument> diff --git a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml index 888595ccc..c597b41d1 100644 --- a/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml +++ b/sources/pyside2/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml @@ -44,7 +44,7 @@ <object-type name="QXmlSchema" since="4.6" /> <!-- Qt scoped pointer does not allow declare this as value type --> <object-type name="QXmlSchemaValidator" since="4.6"> - <modify-function signature="schema() const"> + <modify-function signature="schema()const"> <modify-argument index="return"> <replace-type modified-type="QXmlSchema*"/> <define-ownership owner="target"/> @@ -70,7 +70,7 @@ <primitive-type name="PrefixCode"/> <primitive-type name="LocalNameCode"/> <!-- ### These methods aren't part of Qt public API --> - <modify-function signature="QXmlName(QXmlName::NamespaceCode, QXmlName::LocalNameCode, QXmlName::PrefixCode)" remove="all"/> + <modify-function signature="QXmlName(QXmlName::NamespaceCode,QXmlName::LocalNameCode,QXmlName::PrefixCode)" remove="all"/> <modify-function signature="setNamespaceURI(QXmlName::NamespaceCode)" remove="all" /> <modify-function signature="localName()const" remove="all" /> <modify-function signature="prefix()const" remove="all" /> @@ -101,7 +101,7 @@ <modify-function signature="kind()const" remove="all" /> <modify-function signature="isDeepEqual(const QXmlNodeModelIndex&)const" remove="all" /> <modify-function signature="compareOrder(const QXmlNodeModelIndex &)const" remove="all" /> - <modify-function signature="sendNamespaces(QAbstractXmlReceiver *)const" remove="all" /> + <modify-function signature="sendNamespaces(QAbstractXmlReceiver*)const" remove="all" /> <modify-function signature="namespaceBindings()const" remove="all" /> <modify-function signature="namespaceForPrefix(QXmlName::PrefixCode)const" remove="all" /> <modify-function signature="stringValue()const" remove="all" /> diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in index 4ce266b69..f33b05e31 100644 --- a/sources/pyside2/PySide2/__init__.py.in +++ b/sources/pyside2/PySide2/__init__.py.in @@ -20,10 +20,16 @@ def _setupQtDirectories(): # Used by signature module. os.environ["PYSIDE_PACKAGE_DIR"] = pyside_package_dir - # On Windows add the PySide2\openssl folder (if it exists) to the - # PATH so that the SSL DLLs can be found when Qt tries to dynamically - # load them. Tell Qt to load them and then reset the PATH. if sys.platform == 'win32': + # PATH has to contain the package directory, otherwise plugins + # won't be able to find their required Qt libraries (e.g. the + # svg image plugin won't find Qt5Svg.dll). + os.environ['PATH'] = pyside_package_dir + ";" + os.environ['PATH'] + + # On Windows add the PySide2\openssl folder (if it exists) to + # the PATH so that the SSL DLLs can be found when Qt tries to + # dynamically load them. Tell Qt to load them and then reset + # the PATH. openssl_dir = os.path.join(pyside_package_dir, 'openssl') if os.path.exists(openssl_dir): path = os.environ['PATH'] diff --git a/sources/pyside2/PySide2/qt.conf.in b/sources/pyside2/PySide2/qt.conf.in new file mode 100644 index 000000000..ff5b0a30e --- /dev/null +++ b/sources/pyside2/PySide2/qt.conf.in @@ -0,0 +1,2 @@ +[Paths] +Prefix = @QT_CONF_PREFIX@ diff --git a/sources/pyside2/PySide2/support/signature/qt_attribution.json b/sources/pyside2/PySide2/support/signature/qt_attribution.json new file mode 100644 index 000000000..331b3e814 --- /dev/null +++ b/sources/pyside2/PySide2/support/signature/qt_attribution.json @@ -0,0 +1,12 @@ +{ + "Id": "python", + "Name": "Python", + "QDocModule": "QtForPython", + "QtUsage": "Used for Qt for Python in the signature extension.", + "Description": "Qt for Python is an add-on for Python. The signature packages of PySide uses certain copied and adapted source files (inspect.py, backport_inspect.py, typing27.py, typing36.py). See the folder sources/pyside2/PySide2/support/signature .", + "Homepage": "http://www.python.org/", + "Version": "3.6.5", + "License": "PSF LICENSE AGREEMENT FOR PYTHON 3.6.5", + "LicenseFile": "backport_inspect.py", + "Copyright": "© Copyright 2001-2018, Python Software Foundation." +} diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index b223edc6c..51bbb22e1 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -162,10 +162,10 @@ static void destructionVisitor(SbkObject* pyObj, void* data) void destroyQCoreApplication() { - SignalManager::instance().clear(); QCoreApplication* app = QCoreApplication::instance(); if (!app) return; + SignalManager::instance().clear(); Shiboken::BindingManager& bm = Shiboken::BindingManager::instance(); SbkObject* pyQApp = bm.retrieveWrapper(app); @@ -442,6 +442,11 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x16,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0 }; +// Note that setting QT_LOGGING_RULES for categories used before QCoreApplication is instantiated, +// will only work on Qt 5.9.4+. On lower versions, it will appear that setting QT_LOGGING_RULES +// does not affect lcPysideQtConf in any way. +Q_LOGGING_CATEGORY(lcPySide2, "pyside2", QtWarningMsg) + bool registerInternalQtConf() { // Guard to ensure single registration. @@ -449,18 +454,49 @@ bool registerInternalQtConf() static bool registrationAttempted = false; #else static bool registrationAttempted = true; + qCDebug(lcPySide2) << "PySide2 was built without qt.conf modification support. " + "No special qt.conf behavior will be applied."; #endif static bool isRegistered = false; if (registrationAttempted) return isRegistered; registrationAttempted = true; + // Support PyInstaller case when a qt.conf file might be provided next to the generated + // PyInstaller executable. + // This will disable the internal qt.conf which points to the PySide2 subdirectory (due to the + // subdirectory not existing anymore). + QString executablePath = +#if PY_MAJOR_VERSION >= 3 + QString::fromWCharArray(Py_GetProgramFullPath()); +#else + // Python 2 unfortunately returns a char* array instead of a wchar*, which means that on + // Windows if the executable path contains unicode characters, the returned path will be + // invalid. We can't use QCoreApplication::applicationFilePath because it requires an + // existing QCoreApplication instance despite being a static method. + // This means that a qt.conf near an executable won't be picked up correctly on + // Windows + Python 2. + QString::fromLocal8Bit(Py_GetProgramFullPath()); +#endif + QString appDirPath = QFileInfo(executablePath).absolutePath(); + QString maybeQtConfPath = QDir(appDirPath).filePath(QStringLiteral("qt.conf")); + bool executableQtConfAvailable = QFileInfo::exists(maybeQtConfPath); + maybeQtConfPath = QDir::toNativeSeparators(maybeQtConfPath); + if (!executableQtConfAvailable) { + qCDebug(lcPySide2) << "No qt.conf found near executable at: " << maybeQtConfPath + << "\nTrying next candidates."; + } + // Allow disabling the usage of the internal qt.conf. This is necessary for tests to work, // because tests are executed before the package is installed, and thus the Prefix specified // in qt.conf would point to a not yet existing location. bool disableInternalQtConf = qEnvironmentVariableIntValue("PYSIDE_DISABLE_INTERNAL_QT_CONF") > 0 ? true : false; - if (disableInternalQtConf) { + if (disableInternalQtConf || executableQtConfAvailable) { + if (executableQtConfAvailable) + qCDebug(lcPySide2) << "Using qt.conf found near executable at: " << maybeQtConfPath; + if (disableInternalQtConf) + qCDebug(lcPySide2) << "Internal qt.conf usage disabled via environment variable."; registrationAttempted = true; return false; } @@ -494,7 +530,14 @@ bool registerInternalQtConf() // rccData needs to be static, otherwise when it goes out of scope, the Qt resource system // will point to invalid memory. - static QByteArray rccData = QByteArray("[Paths]\nPrefix = ") + prefixPath.toLocal8Bit(); + static QByteArray rccData = QByteArray("[Paths]\nPrefix = ") + prefixPath.toLocal8Bit() +#ifdef Q_OS_WIN + // LibraryExecutables needs to point to Prefix instead of ./bin because we don't + // currently conform to the Qt default directory layout on Windows. This is necessary + // for QtWebEngineCore to find the location of QtWebEngineProcess.exe. + + QByteArray("\nLibraryExecutables = ") + prefixPath.toLocal8Bit() +#endif + ; rccData.append('\n'); // The RCC data structure expects a 4-byte size value representing the actual data. @@ -510,6 +553,9 @@ bool registerInternalQtConf() reinterpret_cast<const unsigned char *>( rccData.constData())); + if (isRegistered) + qCDebug(lcPySide2) << "Using internal qt.conf with prefix pointing to: " << prefixPath; + return isRegistered; } diff --git a/sources/pyside2/libpyside/pyside.h b/sources/pyside2/libpyside/pyside.h index becb92208..d36965d7b 100644 --- a/sources/pyside2/libpyside/pyside.h +++ b/sources/pyside2/libpyside/pyside.h @@ -50,6 +50,7 @@ #include <QMetaType> #include <QHash> #include <QList> +#include <QLoggingCategory> struct SbkObjectType; @@ -163,6 +164,8 @@ PYSIDE_API QString pyStringToQString(PyObject *str); */ PYSIDE_API bool registerInternalQtConf(); +Q_DECLARE_LOGGING_CATEGORY(lcPySide2) + } //namespace PySide diff --git a/sources/pyside2/libpyside/signalmanager.cpp.in b/sources/pyside2/libpyside/signalmanager.cpp.in index 08c57c218..ca176c693 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp.in +++ b/sources/pyside2/libpyside/signalmanager.cpp.in @@ -116,19 +116,19 @@ namespace PySide { PyObjectWrapper::PyObjectWrapper() :m_me(Py_None) { - Py_INCREF(m_me); + Py_XINCREF(m_me); } PyObjectWrapper::PyObjectWrapper(PyObject* me) : m_me(me) { - Py_INCREF(m_me); + Py_XINCREF(m_me); } PyObjectWrapper::PyObjectWrapper(const PyObjectWrapper &other) : m_me(other.m_me) { - Py_INCREF(m_me); + Py_XINCREF(m_me); } PyObjectWrapper::~PyObjectWrapper() @@ -139,13 +139,13 @@ PyObjectWrapper::~PyObjectWrapper() return; Shiboken::GilState gil; - Py_DECREF(m_me); + Py_XDECREF(m_me); } PyObjectWrapper& PyObjectWrapper::operator=(const PySide::PyObjectWrapper& other) { - Py_INCREF(other.m_me); - Py_DECREF(m_me); + Py_XINCREF(other.m_me); + Py_XDECREF(m_me); m_me = other.m_me; return *this; } diff --git a/sources/pyside2/tests/QtCore/qobject_inherits_test.py b/sources/pyside2/tests/QtCore/qobject_inherits_test.py index 8c4c797a4..1d089776b 100644 --- a/sources/pyside2/tests/QtCore/qobject_inherits_test.py +++ b/sources/pyside2/tests/QtCore/qobject_inherits_test.py @@ -29,8 +29,12 @@ '''Test cases for QObject methods''' import unittest +import sys -from PySide2.QtCore import QObject +from PySide2.QtCore import QObject, QTimer +from PySide2.QtWidgets import QApplication, QLabel, QVBoxLayout + +is_alive = None class InheritsCase(unittest.TestCase): '''Test case for QObject.inherits''' @@ -87,5 +91,36 @@ class InheritsCase(unittest.TestCase): self.assertRaises(TypeError, declareClass) + # PYSIDE-11: + # The takeOwnership() method was relying that the SbkObject + # had a converter, which it's not the case when multiple + # inheritance is used. + # The deleteLater() method uses the takeOwnership() to give + # control of the object to C++, so it can be remove once + # the destructor is called. + # The solution was to add a default case when the object + # is null under the pythonTypeIsValueType() method in shiboken. + def testDeleteMultipleInheritance(self): + app = QApplication(sys.argv) + class DerivedLabel(QLabel, QObject): + def __del__(self): + global is_alive + is_alive = False + + global is_alive + child = DerivedLabel('Hello') + is_alive = True + parent = QVBoxLayout() + parent.addWidget(child) + parent.removeWidget(child) + child.deleteLater() + self.assertTrue(is_alive) + del child + self.assertTrue(is_alive) + QTimer.singleShot(100, app.quit) + app.exec_() + self.assertFalse(is_alive) + + if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtLocation/CMakeLists.txt b/sources/pyside2/tests/QtLocation/CMakeLists.txt new file mode 100644 index 000000000..b97ac1098 --- /dev/null +++ b/sources/pyside2/tests/QtLocation/CMakeLists.txt @@ -0,0 +1 @@ +PYSIDE_TEST(location.py) diff --git a/sources/pyside2/tests/QtLocation/location.py b/sources/pyside2/tests/QtLocation/location.py new file mode 100644 index 000000000..ca964c46c --- /dev/null +++ b/sources/pyside2/tests/QtLocation/location.py @@ -0,0 +1,41 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Unit test for Location''' + +from PySide2.QtLocation import QGeoServiceProvider +import unittest + +class QLocationTestCase(unittest.TestCase): + def test(self): + geoServiceProvider = QGeoServiceProvider("none") + self.assertEqual(geoServiceProvider.errorString(), + 'The geoservices provider none is not supported.') + +if __name__ == "__main__": + unittest.main() diff --git a/sources/pyside2/tests/QtPositioning/CMakeLists.txt b/sources/pyside2/tests/QtPositioning/CMakeLists.txt new file mode 100644 index 000000000..b9f7631b1 --- /dev/null +++ b/sources/pyside2/tests/QtPositioning/CMakeLists.txt @@ -0,0 +1 @@ +PYSIDE_TEST(positioning.py) diff --git a/sources/pyside2/tests/QtPositioning/positioning.py b/sources/pyside2/tests/QtPositioning/positioning.py new file mode 100644 index 000000000..9f61fe1ef --- /dev/null +++ b/sources/pyside2/tests/QtPositioning/positioning.py @@ -0,0 +1,43 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Unit test for Positioning''' + +from PySide2.QtPositioning import QGeoPositionInfoSource +import unittest + +class QPositioningTestCase(unittest.TestCase): + def test(self): + source = QGeoPositionInfoSource.createDefaultSource(None) + self.assertTrue(source is not None) + name = source.sourceName() + print('QtPositioning source: {}'.format(name)) + self.assertTrue(name) + +if __name__ == "__main__": + unittest.main() diff --git a/sources/pyside2/tests/QtSensors/CMakeLists.txt b/sources/pyside2/tests/QtSensors/CMakeLists.txt new file mode 100644 index 000000000..87e548f87 --- /dev/null +++ b/sources/pyside2/tests/QtSensors/CMakeLists.txt @@ -0,0 +1 @@ +PYSIDE_TEST(sensors.py) diff --git a/sources/pyside2/tests/QtSensors/sensors.py b/sources/pyside2/tests/QtSensors/sensors.py new file mode 100644 index 000000000..5b41ac63d --- /dev/null +++ b/sources/pyside2/tests/QtSensors/sensors.py @@ -0,0 +1,55 @@ +#!/usr/bin/python + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +'''Test cases for QSensor''' + +from PySide2.QtSensors import QSensor, QSensorReading +import unittest + +class QSensorTest(unittest.TestCase): + def test(self): + for sensorType in QSensor.sensorTypes(): + identifiers = QSensor.sensorsForType(sensorType) + values = [] + usedIdentifier = None + for identifier in identifiers: + sensor = QSensor(sensorType, None); + sensor.setIdentifier(identifier) + if sensor.connectToBackend(): + usedIdentifier = identifier + reading = sensor.reading() + for i in range(0, reading.valueCount()): + values.append(reading.value(i)) + break + if usedIdentifier: + print('Sensor ', sensorType, usedIdentifier, values) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt b/sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt new file mode 100644 index 000000000..2e361383c --- /dev/null +++ b/sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt @@ -0,0 +1,29 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +PYSIDE_TEST(web_engine_custom_scheme.py) diff --git a/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py b/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py new file mode 100644 index 000000000..b7c57d8e6 --- /dev/null +++ b/sources/pyside2/tests/QtWebEngineCore/web_engine_custom_scheme.py @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +from __future__ import print_function + +import unittest + +from PySide2.QtCore import QBuffer, QTimer +from PySide2.QtWidgets import QApplication +from PySide2.QtWebEngineWidgets import QWebEngineView, QWebEngineProfile +from PySide2.QtWebEngineCore import QWebEngineUrlSchemeHandler + +class TestSchemeHandler(QWebEngineUrlSchemeHandler): + def requestStarted(self, request): + if request.requestUrl() == "testpy:hello": + request.redirect("testpy:goodbye") + return + + self.buffer = QBuffer() + self.buffer.setData("Really nice goodbye text.") + self.buffer.aboutToClose.connect(self.buffer.deleteLater) + request.reply("text/plain;charset=utf-8", self.buffer) + +class MainTest(unittest.TestCase): + def test_SchemeHandlerRedirect(self): + app = QApplication([]) + handler = TestSchemeHandler() + profile = QWebEngineProfile.defaultProfile() + profile.installUrlSchemeHandler("testpy", handler) + view = QWebEngineView() + view.loadFinished.connect(app.quit) + QTimer.singleShot(5000, app.quit) + view.show() + view.load("testpy:hello") + app.exec_() + self.assertEqual(view.url(), "testpy:goodbye") + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py b/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py index 6ea3aa95a..b4aef26d1 100644 --- a/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py +++ b/sources/pyside2/tests/QtWebEngineWidgets/pyside-474-qtwebengineview.py @@ -39,11 +39,7 @@ class MainTest(unittest.TestCase): qApp = (QtWidgets.QApplication.instance() or QtWidgets.QApplication([])) view = QtWebEngineWidgets.QWebEngineView() - with self.assertRaises(TypeError): - view.findText(123) view.findText("nothing") - # we are testing only the existence of the function, - # after it suddenly showed up. if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWidgets/CMakeLists.txt index fa64d1c3b..9caf7e365 100644 --- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt @@ -82,6 +82,7 @@ PYSIDE_TEST(parent_method_test.py) PYSIDE_TEST(python_properties_test.py) PYSIDE_TEST(qabstracttextdocumentlayout_test.py) PYSIDE_TEST(qaction_test.py) +PYSIDE_TEST(qapp_issue_585.py) PYSIDE_TEST(qapp_test.py) PYSIDE_TEST(qapplication_exit_segfault_test.py) PYSIDE_TEST(qapplication_singleton_test.py) @@ -92,6 +93,7 @@ PYSIDE_TEST(qdynamic_signal.py) PYSIDE_TEST(qformlayout_test.py) PYSIDE_TEST(qgraphicsitem_test.py) PYSIDE_TEST(qgraphicsitem_isblocked_test.py) +PYSIDE_TEST(qgraphicsobjectreimpl_test.py) PYSIDE_TEST(qgraphicsproxywidget_test.py) PYSIDE_TEST(qgraphicsscene_test.py) PYSIDE_TEST(qimage_test.py) @@ -121,6 +123,7 @@ PYSIDE_TEST(qtabwidgetclear_test.py) PYSIDE_TEST(qtextedit_test.py) PYSIDE_TEST(qtextedit_signal_test.py) PYSIDE_TEST(qtreeview_test.py) +PYSIDE_TEST(qtreewidget_test.py) PYSIDE_TEST(qtoolbar_test.py) PYSIDE_TEST(qtoolbox_test.py) PYSIDE_TEST(qvariant_test.py) diff --git a/sources/pyside2/tests/QtWidgets/qapp_issue_585.py b/sources/pyside2/tests/QtWidgets/qapp_issue_585.py new file mode 100644 index 000000000..9dd2014c0 --- /dev/null +++ b/sources/pyside2/tests/QtWidgets/qapp_issue_585.py @@ -0,0 +1,68 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +""" +The bug was caused by this commit: +"Support the qApp macro correctly, final version incl. debug" +e30e0c161b2b4d50484314bf006e9e5e8ff6b380 +2017-10-27 + +The bug was first solved by this commit: +"Fix qApp macro refcount" +b811c874dedd14fd8b072bc73761d39255216073 +2018-03-21 + +This test triggers the refcounting bug of qApp, issue PYSIDE-585. +Finally, the real patch included more changes, because another error +was in the ordering of shutdown calls. It was found using the following +Python configuration: + + In Python 3.6 create a directory 'debug' and cd into it. + + ../configure --with-pydebug --prefix=$HOME/pydebug/ --enable-shared + +Then a lot more refcounting errors show up, which are due to a bug in +the code position of the shutdown procedure. +The reason for the initial refcount bug was that the shutdown code is once +more often called than the creation of the qApp wrapper. +Finally, it was easiest and more intuitive to simply make the refcount of +qApp_content equal to that of Py_None, which is also not supposed to be +garbage-collected. + +For some reason, the test does not work as a unittest because it creates +no crash. We leave it this way. +""" + +from PySide2.QtCore import QTimer +from PySide2 import QtWidgets + +app_instance = QtWidgets.QApplication([]) +# If the following line is commented, application doesn't crash on exit anymore. +app_instance2 = app_instance +QTimer.singleShot(0, qApp.quit) +app_instance.exec_() diff --git a/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py b/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py new file mode 100644 index 000000000..fd79ce3aa --- /dev/null +++ b/sources/pyside2/tests/QtWidgets/qgraphicsobjectreimpl_test.py @@ -0,0 +1,76 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +''' Test cases related to QGraphicsItem and subclasses''' + +import unittest + +from PySide2.QtWidgets import QGraphicsObject, QGraphicsWidget +from PySide2.QtCore import QRectF + +from helper import UsesQApplication + +class GObjA(QGraphicsObject): + def paint(self, *args): + pass + + def boundingRect(self): + return QRectF() + + def itemChange(self, *args): + return QGraphicsObject.itemChange(self, *args) + +class GObjB(QGraphicsObject): + def paint(self, *args): + pass + + def boundingRect(self): + return QRectF() + +class QGraphicsObjectReimpl(UsesQApplication): + '''Test case for reimplementing QGraphicsObject''' + + def testReimplementationTypes(self): + w = QGraphicsWidget() + + # PYSIDE-86: + # This case failed because GObjA was reimplementing + # the method itemChange() from QGraphicsItem, + # and then the QVariant was not associated with + # a QGraphicsItem but a QObjectItem because the base + # class was a QObject. + gobjA = GObjA() + gobjA.setParentItem(w) + self.assertIs(type(w), type(gobjA.parentItem())) + + gobjB = GObjB() + gobjB.setParentItem(w) + self.assertIs(type(w), type(gobjB.parentItem())) + +if __name__ == '__main__': + unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/qtreeview_test.py b/sources/pyside2/tests/QtWidgets/qtreeview_test.py index a731ddafa..703131ec3 100644 --- a/sources/pyside2/tests/QtWidgets/qtreeview_test.py +++ b/sources/pyside2/tests/QtWidgets/qtreeview_test.py @@ -29,7 +29,9 @@ import unittest from PySide2.QtGui import QStandardItemModel -from PySide2.QtWidgets import QWidget, QTreeView, QVBoxLayout, QStyledItemDelegate +from PySide2.QtWidgets import (QWidget, QTreeView, QVBoxLayout, + QStyledItemDelegate, QHeaderView) +from PySide2.QtCore import Qt from helper import UsesQApplication class Widget(QWidget): @@ -85,5 +87,10 @@ class QWidgetTest(UsesQApplication): t.setItemDelegate(QStyledItemDelegate()) self.assertIsInstance(t.itemDelegate(), QStyledItemDelegate) + def testHeader(self): + tree = QTreeView() + tree.setHeader(QHeaderView(Qt.Horizontal)) + self.assertIsNotNone(tree.header()) + if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/qtreewidget_test.py b/sources/pyside2/tests/QtWidgets/qtreewidget_test.py new file mode 100644 index 000000000..11fa83c5a --- /dev/null +++ b/sources/pyside2/tests/QtWidgets/qtreewidget_test.py @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the test suite of PySide2. +## +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## 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 General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## 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-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +import unittest + +from PySide2.QtWidgets import QTreeWidget, QTreeWidgetItem, QPushButton +from helper import UsesQApplication + +class QTreeWidgetTest(UsesQApplication): + + # PYSIDE-73: + # There was a problem when adding items to a QTreeWidget + # when the Widget was being build on the method call instead + # of as a separate variable. + # The problem was there was not ownership transfer, so the + # QTreeWidget did not own the QWidget element + def testSetItemWidget(self): + + treeWidget = QTreeWidget() + treeWidget.setColumnCount(2) + + item = QTreeWidgetItem(['text of column 0', '']) + treeWidget.insertTopLevelItem(0, item) + # Adding QPushButton inside the method + treeWidget.setItemWidget(item, 1, + QPushButton('Push button on column 1')) + + # Getting the widget back + w = treeWidget.itemWidget(treeWidget.itemAt(0,1), 1) + self.assertIsInstance(w, QPushButton) + + p = QPushButton('New independent button') + # Adding QPushButton object from variable + treeWidget.setItemWidget(item, 0, p) + w = treeWidget.itemWidget(treeWidget.itemAt(0,0), 0) + self.assertIsInstance(w, QPushButton) + +if __name__ == '__main__': + unittest.main() |