diff options
Diffstat (limited to 'sources')
99 files changed, 3117 insertions, 2003 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() diff --git a/sources/shiboken2/ApiExtractor/CMakeLists.txt b/sources/shiboken2/ApiExtractor/CMakeLists.txt index 4355e32ef..8d68b0dcf 100644 --- a/sources/shiboken2/ApiExtractor/CMakeLists.txt +++ b/sources/shiboken2/ApiExtractor/CMakeLists.txt @@ -1,5 +1,7 @@ project(apiextractor) +cmake_minimum_required(VERSION 3.1) +cmake_policy(VERSION 3.1) find_package(LibXml2 2.6.32) find_package(LibXslt 1.1.19) @@ -55,11 +57,13 @@ clangparser/clangdebugutils.cpp clangparser/clangutils.cpp # Old parser parser/codemodel.cpp +parser/enumvalue.cpp ) set(APIEXTRACTOR_EXTRA_INCLUDES ${CLANG_EXTRA_INCLUDES}) set(APIEXTRACTOR_EXTRA_LIBRARIES ${CLANG_EXTRA_LIBRARIES}) +add_subdirectory(doc) if (NOT DISABLE_DOCSTRINGS) set(apiextractor_SRC ${apiextractor_SRC} diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp index 1afc7d135..b862ba548 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp @@ -508,8 +508,6 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom) addAbstractMetaClass(cls); } - figureOutEnumValues(); - for (const ClassModelItem &item : typeValues) traverseClassMembers(item); @@ -684,7 +682,6 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom) traverseStreamOperator(item); } - figureOutDefaultEnumArguments(); checkFunctionModifications(); // sort all classes topologically @@ -839,207 +836,6 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseNamespace(const FileModel return metaClass; } -struct Operator -{ - enum Type { Complement, Plus, ShiftRight, ShiftLeft, None }; - - Operator() : type(None) {} - - int calculate(int x) - { - switch (type) { - case Complement: return ~value; - case Plus: return x + value; - case ShiftRight: return x >> value; - case ShiftLeft: return x << value; - case None: return x; - } - return x; - } - - Type type; - int value; -}; - - - -Operator findOperator(QString* s) -{ - const char *names[] = { - "~", - "+", - ">>", - "<<" - }; - - for (int i = 0; i < Operator::None; ++i) { - QString name = QLatin1String(names[i]); - QString str = *s; - int splitPoint = str.indexOf(name); - if (splitPoint > -1) { - bool ok; - QString right = str.mid(splitPoint + name.length()); - Operator op; - - op.value = right.toInt(&ok); - if (!ok && right.length() > 0 && right.at(right.length() - 1).toLower() == QLatin1Char('u')) - op.value = right.left(right.length() - 1).toUInt(&ok, 0); - - if (ok) { - op.type = Operator::Type(i); - if (splitPoint > 0) - *s = str.left(splitPoint).trimmed(); - else - *s = QString(); - return op; - } - } - } - return Operator(); -} - -int AbstractMetaBuilderPrivate::figureOutEnumValue(const QString &stringValue, - int oldValuevalue, - AbstractMetaEnum *metaEnum, - AbstractMetaFunction *metaFunction) -{ - if (stringValue.isEmpty()) - return oldValuevalue; - - QStringList stringValues = stringValue.split(QLatin1Char('|')); - - int returnValue = 0; - - bool matched = false; - - for (int i = 0; i < stringValues.size(); ++i) { - QString s = stringValues.at(i).trimmed(); - - bool ok; - int v; - - Operator op = findOperator(&s); - - if (s.length() > 0 && s.at(0) == QLatin1Char('0')) - v = s.toUInt(&ok, 0); - else if (s.length() > 0 && s.at(s.length() - 1).toLower() == QLatin1Char('u')) - v = s.left(s.length() - 1).toUInt(&ok, 0); - else - v = s.toInt(&ok); - - if (ok || s.isEmpty()) { - matched = true; - } else if (m_enumValues.contains(s)) { - v = m_enumValues[s]->value(); - matched = true; - } else { - if (metaEnum) { - v = findOutValueFromString(s, matched); - if (!matched) { - QString enclosingClass = QString(metaEnum->enclosingClass() ? metaEnum->enclosingClass()->name() + colonColon() : QString()); - qCWarning(lcShiboken).noquote().nospace() - << "unhandled enum value: " << s << " in " - << enclosingClass << metaEnum->name() << " from header '" - << metaEnum->typeEntry()->include().name() << '\''; - } - } else { - qCWarning(lcShiboken) << "unhandled enum value: Unknown enum"; - } - } - - if (matched) - returnValue |= op.calculate(v); - } - - if (!matched) { - QString warn = QStringLiteral("unmatched enum %1").arg(stringValue); - - if (metaFunction) { - warn += QStringLiteral(" when parsing default value of '%1' in class '%2'") - .arg(metaFunction->name(), metaFunction->implementingClass()->name()); - } - warn += QLatin1String(" from header '") + metaEnum->typeEntry()->include().name() - + QLatin1Char('\''); - - qCWarning(lcShiboken).noquote().nospace() << warn; - returnValue = oldValuevalue; - } - - return returnValue; -} - -void AbstractMetaBuilderPrivate::figureOutEnumValuesForClass(AbstractMetaClass *metaClass, - QSet<AbstractMetaClass *> *classes) -{ - AbstractMetaClass* base = metaClass->baseClass(); - - if (base && !classes->contains(base)) - figureOutEnumValuesForClass(base, classes); - - if (classes->contains(metaClass)) - return; - - const AbstractMetaEnumList &enums = metaClass->enums(); - for (AbstractMetaEnum* e : enums) { - if (!e) { - qCWarning(lcShiboken).noquote().nospace() << "bad enum in class " << metaClass->name(); - continue; - } - AbstractMetaEnumValueList lst = e->values(); - int value = 0; - for (int i = 0; i < lst.size(); ++i) { - value = figureOutEnumValue(lst.at(i)->stringValue(), value, e); - lst.at(i)->setValue(value); - value++; - } - } - - *classes += metaClass; -} - - -void AbstractMetaBuilderPrivate::figureOutEnumValues() -{ - // Keep a set of classes that we already traversed. We use this to - // enforce that we traverse base classes prior to subclasses. - QSet<AbstractMetaClass*> classes; - for (AbstractMetaClass *c : qAsConst(m_metaClasses)) - figureOutEnumValuesForClass(c, &classes); - - for (AbstractMetaEnum* metaEnum : qAsConst(m_globalEnums)) { - AbstractMetaEnumValueList enumValues = metaEnum->values(); - int value = 0; - for (int i = 0; i < enumValues.size(); ++i) { - value = figureOutEnumValue(enumValues.at(i)->stringValue(), value, metaEnum); - enumValues.at(i)->setValue(value); - value++; - } - } -} - -void AbstractMetaBuilderPrivate::figureOutDefaultEnumArguments() -{ - for (AbstractMetaClass* metaClass : qAsConst(m_metaClasses)) { - const AbstractMetaFunctionList &functions = metaClass->functions(); - for (AbstractMetaFunction* metaFunction : functions) { - const AbstractMetaArgumentList &arguments = metaFunction->arguments(); - for (AbstractMetaArgument *arg : arguments) { - QString expr = arg->defaultValueExpression(); - if (expr.isEmpty()) - continue; - - if (!metaFunction->replacedDefaultExpression(metaFunction->implementingClass(), - arg->argumentIndex() + 1).isEmpty()) { - continue; - } - - arg->setDefaultValueExpression(expr); - } - } - } -} - - AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(EnumModelItem enumItem, AbstractMetaClass *enclosing, const QSet<QString> &enumsDeclarations) @@ -1055,7 +851,7 @@ AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(EnumModelItem enumIte nspace = QStringList(names.mid(0, names.size() - 1)).join(colonColon()); typeEntry = new EnumTypeEntry(nspace, enumName, QVersionNumber(0, 0)); TypeDatabase::instance()->addType(typeEntry); - } else if (!enumItem->isAnonymous()) { + } else if (enumItem->enumKind() != AnonymousEnum) { typeEntry = TypeDatabase::instance()->findType(qualifiedName); } else { QStringList tmpQualifiedName = enumItem->qualifiedName(); @@ -1096,12 +892,15 @@ AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(EnumModelItem enumIte } AbstractMetaEnum *metaEnum = new AbstractMetaEnum; + metaEnum->setEnumKind(enumItem->enumKind()); + metaEnum->setSigned(enumItem->isSigned()); if (enumsDeclarations.contains(qualifiedName) || enumsDeclarations.contains(enumName)) { metaEnum->setHasQEnumsDeclaration(true); } - metaEnum->setTypeEntry((EnumTypeEntry*) typeEntry); + EnumTypeEntry *enumTypeEntry = static_cast<EnumTypeEntry *>(typeEntry); + metaEnum->setTypeEntry(enumTypeEntry); switch (enumItem->accessPolicy()) { case CodeModel::Public: *metaEnum += AbstractMetaAttributes::Public; @@ -1127,7 +926,8 @@ AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(EnumModelItem enumIte metaEnumValue->setName(value->name()); // Deciding the enum value... - metaEnumValue->setStringValue(value->value()); + metaEnumValue->setStringValue(value->stringValue()); + metaEnumValue->setValue(value->value()); metaEnum->addEnumValue(metaEnumValue); if (ReportHandler::isDebug(ReportHandler::FullDebug)) { @@ -1158,7 +958,9 @@ AbstractMetaEnum *AbstractMetaBuilderPrivate::traverseEnum(EnumModelItem enumIte name += colonColon(); } name += e->name(); - EnumValueTypeEntry* enumValue = new EnumValueTypeEntry(name, e->value(), static_cast<EnumTypeEntry*>(typeEntry), typeEntry->version()); + EnumValueTypeEntry *enumValue = + new EnumValueTypeEntry(name, e->stringValue(), + enumTypeEntry, enumTypeEntry->version()); TypeDatabase::instance()->addType(enumValue); } @@ -2286,6 +2088,20 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(FunctionModel bool ok; AbstractMetaType* metaType = translateType(arg->type(), &ok); if (!ok) { + // If an invalid argument has a default value, simply remove it + if (arg->defaultValue()) { + if (!m_currentClass + || (m_currentClass->typeEntry()->codeGeneration() + & TypeEntry::GenerateTargetLang)) { + qCWarning(lcShiboken).noquote().nospace() + << "Stripping argument #" << (i + 1) << " of " + << originalQualifiedSignatureWithReturn + << " due to unmatched type \"" << arg->type().toString() + << "\" with default expression \"" + << arg->defaultValueExpression() << "\"."; + } + break; + } Q_ASSERT(metaType == 0); const QString reason = msgUnmatchedParameterType(arg, i); qCWarning(lcShiboken).noquote().nospace() @@ -2321,7 +2137,7 @@ AbstractMetaFunction *AbstractMetaBuilderPrivate::traverseFunction(FunctionModel metaFunction->setArguments(metaArguments); // Find the correct default values - for (int i = 0; i < arguments.size(); ++i) { + for (int i = 0, size = metaArguments.size(); i < size; ++i) { ArgumentModelItem arg = arguments.at(i); AbstractMetaArgument* metaArg = metaArguments.at(i); @@ -2570,9 +2386,9 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const TypeInfo &_typ arrayType->setArrayElementType(elementType); if (!typeInfo.arrays.at(i).isEmpty()) { bool _ok; - const int elems = findOutValueFromString(typeInfo.arrays.at(i), _ok); + const qint64 elems = findOutValueFromString(typeInfo.arrays.at(i), _ok); if (_ok) - arrayType->setArrayElementCount(elems); + arrayType->setArrayElementCount(int(elems)); } arrayType->setTypeEntry(new ArrayTypeEntry(elementType->typeEntry() , elementType->typeEntry()->version())); decideUsagePattern(arrayType); @@ -2712,9 +2528,9 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const TypeInfo &_typ } -int AbstractMetaBuilderPrivate::findOutValueFromString(const QString &stringValue, bool &ok) +qint64 AbstractMetaBuilderPrivate::findOutValueFromString(const QString &stringValue, bool &ok) { - int value = stringValue.toInt(&ok); + qint64 value = stringValue.toLongLong(&ok); if (ok) return value; @@ -2735,13 +2551,13 @@ int AbstractMetaBuilderPrivate::findOutValueFromString(const QString &stringValu AbstractMetaEnumValue *enumValue = AbstractMetaClass::findEnumValue(m_metaClasses, stringValue); if (enumValue) { ok = true; - return enumValue->value(); + return enumValue->value().value(); } for (AbstractMetaEnum *metaEnum : qAsConst(m_globalEnums)) { if (const AbstractMetaEnumValue *ev = metaEnum->findEnumValue(stringValue)) { ok = true; - return ev->value(); + return ev->value().value(); } } diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h index 7a2565914..7f5e866ab 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h +++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h @@ -60,11 +60,6 @@ public: AbstractMetaClass *argumentToClass(ArgumentModelItem); - void figureOutEnumValuesForClass(AbstractMetaClass *metaClass, QSet<AbstractMetaClass *> *classes); - int figureOutEnumValue(const QString &name, int value, AbstractMetaEnum *meta_enum, AbstractMetaFunction *metaFunction = 0); - void figureOutEnumValues(); - void figureOutDefaultEnumArguments(); - void addAbstractMetaClass(AbstractMetaClass *cls); AbstractMetaClass *traverseTypeDef(const FileModelItem &dom, const TypeDefModelItem &typeDef); @@ -129,7 +124,7 @@ public: bool resolveType = true, bool resolveScope = true); - int findOutValueFromString(const QString &stringValue, bool &ok); + qint64 findOutValueFromString(const QString &stringValue, bool &ok); void decideUsagePattern(AbstractMetaType *type); diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp index 4e507cd38..235413165 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp @@ -1700,7 +1700,10 @@ QDebug operator<<(QDebug d, const AbstractMetaEnum *ae) d.nospace(); d << "AbstractMetaEnum("; if (ae) { - d << ae->fullName() << '['; + d << ae->fullName(); + if (!ae->isSigned()) + d << " (unsigned) "; + d << '['; const AbstractMetaEnumValueList &values = ae->values(); for (int i = 0, count = values.size(); i < count; ++i) { if (i) @@ -2411,7 +2414,7 @@ QDebug operator<<(QDebug d, const AbstractMetaClass *ac) */ AbstractMetaEnum::AbstractMetaEnum() : - m_hasQenumsDeclaration(false) + m_hasQenumsDeclaration(false), m_signed(true) { } @@ -2457,8 +2460,3 @@ QString AbstractMetaEnum::package() const { return m_typeEntry->targetLangPackage(); } - -bool AbstractMetaEnum::isAnonymous() const -{ - return m_typeEntry->isAnonymous(); -} diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h index 45a55e570..7e0bfa322 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h @@ -34,6 +34,7 @@ #include "typesystem_typedefs.h" #include "parser/codemodel_enums.h" +#include "parser/enumvalue.h" #include <QtCore/qobjectdefs.h> #include <QtCore/QStringList> @@ -1090,12 +1091,12 @@ class AbstractMetaEnumValue public: AbstractMetaEnumValue() {} - int value() const + EnumValue value() const { return m_value; } - void setValue(int value) + void setValue(EnumValue value) { m_value = value; } @@ -1134,7 +1135,7 @@ private: QString m_name; QString m_stringValue; - int m_value = 0; + EnumValue m_value; Documentation m_doc; }; @@ -1168,6 +1169,11 @@ public: return package() + QLatin1Char('.') + qualifier() + QLatin1Char('.') + name(); } + EnumKind enumKind() const { return m_enumKind; } + void setEnumKind(EnumKind kind) { m_enumKind = kind; } + + bool isAnonymous() const { return m_enumKind == AnonymousEnum; } + // Has the enum been declared inside a Q_ENUMS() macro in its enclosing class? void setHasQEnumsDeclaration(bool on) { @@ -1199,14 +1205,17 @@ public: m_class = c; } - bool isAnonymous() const; + bool isSigned() const { return m_signed; } + void setSigned(bool s) { m_signed = s; } private: AbstractMetaEnumValueList m_enumValues; EnumTypeEntry *m_typeEntry = nullptr; AbstractMetaClass *m_class = nullptr; + EnumKind m_enumKind = CEnum; uint m_hasQenumsDeclaration : 1; + uint m_signed : 1; }; #ifndef QT_NO_DEBUG_STREAM diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp index 1ed054d91..b57ef2f43 100644 --- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp +++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp @@ -41,6 +41,7 @@ #include <QtCore/QVector> #include <string.h> +#include <ctype.h> #if QT_VERSION < 0x050800 # define Q_FALLTHROUGH() (void)0 @@ -123,6 +124,24 @@ static void setFileName(const CXCursor &cursor, _CodeModelItem *item) } } +static bool isSigned(CXTypeKind kind) +{ + switch (kind) { + case CXType_UChar: + case CXType_Char16: + case CXType_Char32: + case CXType_UShort: + case CXType_UInt: + case CXType_ULong: + case CXType_ULongLong: + case CXType_UInt128: + return false; + default: + break; + } + return true; +} + class BuilderPrivate { public: typedef QHash<CXCursor, ClassModelItem> CursorClassHash; @@ -437,6 +456,36 @@ QString BuilderPrivate::cursorValueExpression(BaseVisitor *bv, const CXCursor &c return QString::fromLocal8Bit(equalSign, int(snippet.second - equalSign)).trimmed(); } +// A hacky reimplementation of clang_EnumDecl_isScoped() for Clang < 5.0 +// which simply checks for a blank-delimited " class " keyword in the enum snippet. + +#define CLANG_NO_ENUMDECL_ISSCOPED \ + (CINDEX_VERSION_MAJOR == 0 && CINDEX_VERSION_MINOR < 43) + +#if CLANG_NO_ENUMDECL_ISSCOPED +static const char *indexOf(const BaseVisitor::CodeSnippet &snippet, const char *needle) +{ + const size_t snippetLength = snippet.first ? size_t(snippet.second - snippet.first) : 0; + const size_t needleLength = strlen(needle); + if (needleLength > snippetLength) + return nullptr; + for (const char *c = snippet.first, *end = snippet.second - needleLength; c < end; ++c) { + if (memcmp(c, needle, needleLength) == 0) + return c; + } + return nullptr; +} + +long clang_EnumDecl_isScoped4(BaseVisitor *bv, const CXCursor &cursor) +{ + BaseVisitor::CodeSnippet snippet = bv->getCodeSnippet(cursor); + const char *classSpec = indexOf(snippet, "class"); + const bool isClass = classSpec && classSpec > snippet.first + && isspace(*(classSpec - 1)) && isspace(*(classSpec + 5)); + return isClass ? 1 : 0; +} +#endif // CLANG_NO_ENUMDECL_ISSCOPED + // Add a base class to the current class from CXCursor_CXXBaseSpecifier void BuilderPrivate::addBaseClass(const CXCursor &cursor) { @@ -641,13 +690,22 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor) break; case CXCursor_EnumDecl: { QString name = getCursorSpelling(cursor); - const bool anonymous = name.isEmpty(); - if (anonymous) + EnumKind kind = CEnum; + if (name.isEmpty()) { + kind = AnonymousEnum; name = QStringLiteral("enum_") + QString::number(++d->m_anonymousEnumCount); +#if !CLANG_NO_ENUMDECL_ISSCOPED + } else if (clang_EnumDecl_isScoped(cursor) != 0) { +#else + } else if (clang_EnumDecl_isScoped4(this, cursor) != 0) { +#endif + kind = EnumClass; + } d->m_currentEnum.reset(new _EnumModelItem(d->m_model, name)); setFileName(cursor, d->m_currentEnum.data()); d->m_currentEnum->setScope(d->m_scope); - d->m_currentEnum->setAnonymous(anonymous); + d->m_currentEnum->setEnumKind(kind); + d->m_currentEnum->setSigned(isSigned(clang_getEnumDeclIntegerType(cursor).kind)); if (!qSharedPointerDynamicCast<_ClassModelItem>(d->m_scopeStack.back()).isNull()) d->m_currentEnum->setAccessPolicy(accessPolicy(clang_getCXXAccessSpecifier(cursor))); d->m_scopeStack.back()->addEnum(d->m_currentEnum); @@ -661,8 +719,14 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor) appendDiagnostic(d); return Error; } + EnumValue enumValue; + if (d->m_currentEnum->isSigned()) + enumValue.setValue(clang_getEnumConstantDeclValue(cursor)); + else + enumValue.setUnsignedValue(clang_getEnumConstantDeclUnsignedValue(cursor)); EnumeratorModelItem enumConstant(new _EnumeratorModelItem(d->m_model, name)); - enumConstant->setValue(d->cursorValueExpression(this, cursor)); + enumConstant->setStringValue(d->cursorValueExpression(this, cursor)); + enumConstant->setValue(enumValue); d->m_currentEnum->addEnumerator(enumConstant); } break; diff --git a/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt b/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt index d78844dc8..a1995e96f 100644 --- a/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt +++ b/sources/shiboken2/ApiExtractor/doc/CMakeLists.txt @@ -1,10 +1,10 @@ - +message("Building ApiExtractor documentation") find_program(SPHINX sphinx-build DOC "Path to sphinx-build binary.") if (SPHINX) - message("-- sphinx-build - found") + message(STATUS "sphinx-build - found") configure_file(conf.py.in conf.py @ONLY) - add_custom_target(doc ${SPHINX} -b html -c . ${CMAKE_CURRENT_SOURCE_DIR} html ) + add_custom_target(doc_apiextractor ${SPHINX} -b html -c . ${CMAKE_CURRENT_SOURCE_DIR} html ) else() - message("-- sphinx-build - not found! doc target disabled") -endif()
\ No newline at end of file + message(STATUS "sphinx-build - not found! doc_apiextractor target disabled") +endif() diff --git a/sources/shiboken2/ApiExtractor/doc/conf.py.in b/sources/shiboken2/ApiExtractor/doc/conf.py.in index 3a42707ad..7251aaccd 100644 --- a/sources/shiboken2/ApiExtractor/doc/conf.py.in +++ b/sources/shiboken2/ApiExtractor/doc/conf.py.in @@ -22,7 +22,8 @@ import sys, os # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.ifconfig', 'sphinx.ext.refcounting', 'sphinx.ext.coverage'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', + 'sphinx.ext.ifconfig', 'sphinx.ext.coverage'] rst_epilog = """ .. |project| replace:: API Extractor diff --git a/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst b/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst index 646e76043..322f9bca6 100644 --- a/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst +++ b/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst @@ -180,10 +180,6 @@ enum-type Notice that the **enum-type** tag can either have **name** or **identified-by-value** but not both. - The *optional* boolean attribute **class** specifies whether the underlying - enumeration is a C++ 11 enumeration class. In that case, the enumeration values - need to be qualified by the enumeration name to match the C++ Syntax. - The **revision** attribute can be used to specify a revision for each type, easing the production of ABI compatible bindings. diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp index a35ca314b..1262f5901 100644 --- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp +++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp @@ -1014,22 +1014,32 @@ void _EnumModelItem::addEnumerator(EnumeratorModelItem item) m_enumerators.append(item); } -bool _EnumModelItem::isAnonymous() const +bool _EnumModelItem::isSigned() const { - return m_anonymous; + return m_signed; } -void _EnumModelItem::setAnonymous(bool anonymous) +void _EnumModelItem::setSigned(bool s) { - m_anonymous = anonymous; + m_signed = s; } #ifndef QT_NO_DEBUG_STREAM void _EnumModelItem::formatDebug(QDebug &d) const { _CodeModelItem::formatDebug(d); - if (m_anonymous) - d << " (anonymous)"; + switch (m_enumKind) { + case CEnum: + break; + case AnonymousEnum: + d << " (anonymous)"; + break; + case EnumClass: + d << " (class)"; + break; + } + if (!m_signed) + d << " (unsigned)"; formatModelItemList(d, ", enumerators=", m_enumerators); } #endif // !QT_NO_DEBUG_STREAM @@ -1039,22 +1049,21 @@ _EnumeratorModelItem::~_EnumeratorModelItem() { } -QString _EnumeratorModelItem::value() const +QString _EnumeratorModelItem::stringValue() const { - return m_value; + return m_stringValue; } -void _EnumeratorModelItem::setValue(const QString &value) +void _EnumeratorModelItem::setStringValue(const QString &value) { - m_value = value; + m_stringValue = value; } #ifndef QT_NO_DEBUG_STREAM void _EnumeratorModelItem::formatDebug(QDebug &d) const { _CodeModelItem::formatDebug(d); - if (!m_value.isEmpty()) - d << ", value=\"" << m_value << '"'; + d << ", value=" << m_value << ", stringValue=\"" << m_stringValue << '"'; } #endif // !QT_NO_DEBUG_STREAM diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h index 2aaea1f78..ed0eedf7d 100644 --- a/sources/shiboken2/ApiExtractor/parser/codemodel.h +++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h @@ -33,6 +33,7 @@ #include "codemodel_fwd.h" #include "codemodel_enums.h" +#include "enumvalue.h" #include <QtCore/QHash> #include <QtCore/QSet> @@ -631,10 +632,10 @@ class _EnumModelItem: public _CodeModelItem public: DECLARE_MODEL_NODE(Enum) - explicit _EnumModelItem(CodeModel *model, int kind = __node_kind) - : _CodeModelItem(model, kind), m_accessPolicy(CodeModel::Public), m_anonymous(false) {} explicit _EnumModelItem(CodeModel *model, const QString &name, int kind = __node_kind) - : _CodeModelItem(model, name, kind), m_accessPolicy(CodeModel::Public), m_anonymous(false) {} + : _CodeModelItem(model, name, kind) {} + explicit _EnumModelItem(CodeModel *model, int kind = __node_kind) + : _CodeModelItem(model, kind) {} ~_EnumModelItem(); CodeModel::AccessPolicy accessPolicy() const; @@ -642,17 +643,22 @@ public: EnumeratorList enumerators() const; void addEnumerator(EnumeratorModelItem item); - bool isAnonymous() const; - void setAnonymous(bool anonymous); + + EnumKind enumKind() const { return m_enumKind; } + void setEnumKind(EnumKind kind) { m_enumKind = kind; } #ifndef QT_NO_DEBUG_STREAM void formatDebug(QDebug &d) const override; #endif + bool isSigned() const; + void setSigned(bool s); + private: - CodeModel::AccessPolicy m_accessPolicy; + CodeModel::AccessPolicy m_accessPolicy = CodeModel::Public; EnumeratorList m_enumerators; - bool m_anonymous; + EnumKind m_enumKind = CEnum; + bool m_signed = true; }; class _EnumeratorModelItem: public _CodeModelItem @@ -666,15 +672,19 @@ public: : _CodeModelItem(model, name, kind) {} ~_EnumeratorModelItem(); - QString value() const; - void setValue(const QString &value); + QString stringValue() const; + void setStringValue(const QString &stringValue); + + EnumValue value() const { return m_value; } + void setValue(EnumValue v) { m_value = v; } #ifndef QT_NO_DEBUG_STREAM void formatDebug(QDebug &d) const override; #endif private: - QString m_value; + QString m_stringValue; + EnumValue m_value; }; class _TemplateParameterModelItem: public _CodeModelItem diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h b/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h index aa8b051d8..3115a9a94 100644 --- a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h +++ b/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h @@ -35,4 +35,10 @@ enum ReferenceType { RValueReference }; +enum EnumKind { + CEnum, // Standard C: enum Foo { value1, value2 } + AnonymousEnum, // enum { value1, value2 } + EnumClass // C++ 11 : enum class Foo { value1, value2 } +}; + #endif // CODEMODEL_ENUMS_H diff --git a/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp b/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp new file mode 100644 index 000000000..84723eb14 --- /dev/null +++ b/sources/shiboken2/ApiExtractor/parser/enumvalue.cpp @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part 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$ +** +****************************************************************************/ + +#include "enumvalue.h" + +#include <QtCore/QDebug> +#include <QtCore/QString> +#include <QtCore/QTextStream> + +QString EnumValue::toString() const +{ + return m_type == EnumValue::Signed + ? QString::number(m_value) : QString::number(m_unsignedValue); +} + +void EnumValue::setValue(qint64 v) +{ + m_value = v; + m_type = Signed; +} + +void EnumValue::setUnsignedValue(quint64 v) +{ + m_unsignedValue = v; + m_type = Unsigned; +} + +#ifndef QT_NO_DEBUG_STREAM +QDebug operator<<(QDebug d,const EnumValue &v) +{ + QDebugStateSaver saver(d); + d.nospace(); + d.noquote(); + d << "EnumValue("; + if (v.m_type == EnumValue::Signed) + d << v.m_value; + else + d << v.m_unsignedValue << 'u'; + d << ')'; + return d; +} +#endif // !QT_NO_DEBUG_STREAM + +QTextStream &operator<<(QTextStream &s, const EnumValue &v) +{ + if (v.m_type == EnumValue::Signed) + s << v.m_value; + else + s << v.m_unsignedValue; + return s; +} diff --git a/sources/shiboken2/ApiExtractor/parser/enumvalue.h b/sources/shiboken2/ApiExtractor/parser/enumvalue.h new file mode 100644 index 000000000..2e2070306 --- /dev/null +++ b/sources/shiboken2/ApiExtractor/parser/enumvalue.h @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part 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$ +** +****************************************************************************/ + +#ifndef ENUMVALUE_H +#define ENUMVALUE_H + +#include <QtCore/QtGlobal> + +QT_FORWARD_DECLARE_CLASS(QDebug) +QT_FORWARD_DECLARE_CLASS(QString) +QT_FORWARD_DECLARE_CLASS(QTextStream) + +class EnumValue +{ +public: + enum Type + { + Signed, + Unsigned + }; + + QString toString() const; + + Type type() { return m_type; } + qint64 value() const { return m_value; } + quint64 unsignedValue() const { return m_unsignedValue; } + + void setValue(qint64 v); + void setUnsignedValue(quint64 v); + +private: +#ifndef QT_NO_DEBUG_STREAM + friend QDebug operator<<(QDebug, const EnumValue &); +#endif + friend QTextStream &operator<<(QTextStream &, const EnumValue &); + + union + { + qint64 m_value = 0; + quint64 m_unsignedValue; + }; + Type m_type = Signed; +}; + +#endif // ENUMVALUE_H diff --git a/sources/shiboken2/ApiExtractor/qtdocparser.cpp b/sources/shiboken2/ApiExtractor/qtdocparser.cpp index 0ac87bd16..85c3473cd 100644 --- a/sources/shiboken2/ApiExtractor/qtdocparser.cpp +++ b/sources/shiboken2/ApiExtractor/qtdocparser.cpp @@ -68,6 +68,17 @@ static void formatFunctionArgTypeQuery(QTextStream &str, const AbstractMetaArgum str << name; } break; + case AbstractMetaType::ContainerPattern: { // QVector<int> + str << metaType->typeEntry()->qualifiedCppName() << '<'; + const auto instantiations = metaType->instantiations(); + for (int i = 0, size = instantiations.size(); i < size; ++i) { + if (i) + str << ", "; + str << instantiations.at(i)->typeEntry()->qualifiedCppName(); + } + str << '>'; + } + break; default: // Fully qualify enums (Qt::AlignmentFlag), nested classes, etc. str << metaType->typeEntry()->qualifiedCppName(); break; @@ -218,7 +229,8 @@ Documentation QtDocParser::retrieveModuleDocumentation(const QString& name) xquery.setFocus(QUrl(sourceFile)); // Module documentation - QString query = QLatin1String("/WebXML/document/page[@name=\"") + moduleName + QLatin1String("\"]/description"); + QString query = QLatin1String("/WebXML/document/module[@name=\"") + + moduleName + QLatin1String("\"]/description"); const Documentation doc = getDocumentation(xquery, query, DocModificationList()); if (doc.isEmpty()) qCWarning(lcShiboken(), "%s", qPrintable(msgCannotFindDocumentation(sourceFile, "module", name, query))); diff --git a/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp b/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp index cbeb216c9..eb10fc8a0 100644 --- a/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testarrayargument.cpp @@ -133,7 +133,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValue() const AbstractMetaArgument* arg = classA->functions().last()->arguments().first(); QVERIFY(arg->type()->isArray()); - QCOMPARE(arg->type()->arrayElementCount(), nvalues->value()); + QCOMPARE(arg->type()->arrayElementCount(), nvalues->value().value()); QCOMPARE(arg->type()->arrayElementType()->name(), QLatin1String("double")); }; @@ -164,7 +164,7 @@ void TestArrayArgument::testArrayArgumentWithSizeDefinedByEnumValueFromGlobalEnu const AbstractMetaArgument* arg = classA->functions().last()->arguments().first(); QVERIFY(arg->type()->isArray()); - QCOMPARE(arg->type()->arrayElementCount(), nvalues->value()); + QCOMPARE(arg->type()->arrayElementCount(), nvalues->value().value()); QCOMPARE(arg->type()->arrayElementType()->name(), QLatin1String("double")); }; diff --git a/sources/shiboken2/ApiExtractor/tests/testenum.cpp b/sources/shiboken2/ApiExtractor/tests/testenum.cpp index 55c098840..970f6d00c 100644 --- a/sources/shiboken2/ApiExtractor/tests/testenum.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testenum.cpp @@ -149,12 +149,12 @@ void TestEnum::testAnonymousEnum() AbstractMetaEnumValue* enumValueA0 = anonEnumA1->values().first(); QCOMPARE(enumValueA0->name(), QLatin1String("A0")); - QCOMPARE(enumValueA0->value(), 0); + QCOMPARE(enumValueA0->value().value(), 0); QCOMPARE(enumValueA0->stringValue(), QString()); AbstractMetaEnumValue* enumValueA1 = anonEnumA1->values().last(); QCOMPARE(enumValueA1->name(), QLatin1String("A1")); - QCOMPARE(enumValueA1->value(), 1); + QCOMPARE(enumValueA1->value().value(), 1); QCOMPARE(enumValueA1->stringValue(), QString()); AbstractMetaEnum* anonEnumIsThis = classes[0]->findEnum(QLatin1String("isThis")); @@ -164,12 +164,12 @@ void TestEnum::testAnonymousEnum() AbstractMetaEnumValue* enumValueIsThis = anonEnumIsThis->values().first(); QCOMPARE(enumValueIsThis->name(), QLatin1String("isThis")); - QCOMPARE(enumValueIsThis->value(), static_cast<int>(true)); + QCOMPARE(enumValueIsThis->value().value(), static_cast<int>(true)); QCOMPARE(enumValueIsThis->stringValue(), QLatin1String("true")); AbstractMetaEnumValue* enumValueIsThat = anonEnumIsThis->values().last(); QCOMPARE(enumValueIsThat->name(), QLatin1String("isThat")); - QCOMPARE(enumValueIsThat->value(), static_cast<int>(false)); + QCOMPARE(enumValueIsThat->value().value(), static_cast<int>(false)); QCOMPARE(enumValueIsThat->stringValue(), QLatin1String("false")); } @@ -195,12 +195,12 @@ void TestEnum::testGlobalEnums() AbstractMetaEnumValue* enumValueA0 = enumA->values().first(); QCOMPARE(enumValueA0->name(), QLatin1String("A0")); - QCOMPARE(enumValueA0->value(), 0); + QCOMPARE(enumValueA0->value().value(), 0); QCOMPARE(enumValueA0->stringValue(), QString()); AbstractMetaEnumValue* enumValueA1 = enumA->values().last(); QCOMPARE(enumValueA1->name(), QLatin1String("A1")); - QCOMPARE(enumValueA1->value(), 1); + QCOMPARE(enumValueA1->value().value(), 1); QCOMPARE(enumValueA1->stringValue(), QString()); AbstractMetaEnum* enumB = globalEnums.last(); @@ -208,12 +208,12 @@ void TestEnum::testGlobalEnums() AbstractMetaEnumValue* enumValueB0 = enumB->values().first(); QCOMPARE(enumValueB0->name(), QLatin1String("B0")); - QCOMPARE(enumValueB0->value(), 2); + QCOMPARE(enumValueB0->value().value(), 2); QCOMPARE(enumValueB0->stringValue(), QLatin1String("2")); AbstractMetaEnumValue* enumValueB1 = enumB->values().last(); QCOMPARE(enumValueB1->name(), QLatin1String("B1")); - QCOMPARE(enumValueB1->value(), 4); + QCOMPARE(enumValueB1->value().value(), 4); QCOMPARE(enumValueB1->stringValue(), QLatin1String("0x4")); } @@ -245,12 +245,12 @@ void TestEnum::testEnumValueFromNeighbourEnum() AbstractMetaEnumValue* enumValueA0 = enumA->values().first(); QCOMPARE(enumValueA0->name(), QLatin1String("ValueA0")); - QCOMPARE(enumValueA0->value(), 0); + QCOMPARE(enumValueA0->value().value(), 0); QCOMPARE(enumValueA0->stringValue(), QString()); AbstractMetaEnumValue* enumValueA1 = enumA->values().last(); QCOMPARE(enumValueA1->name(), QLatin1String("ValueA1")); - QCOMPARE(enumValueA1->value(), 1); + QCOMPARE(enumValueA1->value().value(), 1); QCOMPARE(enumValueA1->stringValue(), QString()); AbstractMetaEnum* enumB = classes[0]->findEnum(QLatin1String("EnumB")); @@ -259,12 +259,12 @@ void TestEnum::testEnumValueFromNeighbourEnum() AbstractMetaEnumValue* enumValueB0 = enumB->values().first(); QCOMPARE(enumValueB0->name(), QLatin1String("ValueB0")); - QCOMPARE(enumValueB0->value(), 1); + QCOMPARE(enumValueB0->value().value(), 1); QCOMPARE(enumValueB0->stringValue(), QLatin1String("A::ValueA1")); AbstractMetaEnumValue* enumValueB1 = enumB->values().last(); QCOMPARE(enumValueB1->name(), QLatin1String("ValueB1")); - QCOMPARE(enumValueB1->value(), 0); + QCOMPARE(enumValueB1->value().value(), 0); QCOMPARE(enumValueB1->stringValue(), QLatin1String("ValueA0")); } @@ -272,21 +272,25 @@ void TestEnum::testEnumValueFromExpression() { const char* cppCode ="\ struct A {\n\ - enum EnumA {\n\ + enum EnumA : unsigned {\n\ ValueA0 = 3u,\n\ ValueA1 = ~3u,\n\ - ValueA2 = ~3,\n\ + ValueA2 = 0xffffffff,\n\ ValueA3 = 0xf0,\n\ ValueA4 = 8 |ValueA3,\n\ ValueA5 = ValueA3|32,\n\ ValueA6 = ValueA3 >> 1,\n\ ValueA7 = ValueA3 << 1\n\ };\n\ + enum EnumB : int {\n\ + ValueB0 = ~3,\n\ + };\n\ };\n"; const char* xmlCode = "\ <typesystem package=\"Foo\">\n\ <value-type name='A'>\n\ <enum-type name='EnumA'/>\n\ + <enum-type name='EnumB'/>\n\ </value-type>\n\ </typesystem>\n"; @@ -298,47 +302,58 @@ void TestEnum::testEnumValueFromExpression() AbstractMetaEnum* enumA = classA->findEnum(QLatin1String("EnumA")); QVERIFY(enumA); + QVERIFY(!enumA->isSigned()); QCOMPARE(enumA->typeEntry()->qualifiedCppName(), QLatin1String("A::EnumA")); AbstractMetaEnumValue* valueA0 = enumA->values().at(0); QCOMPARE(valueA0->name(), QLatin1String("ValueA0")); QCOMPARE(valueA0->stringValue(), QLatin1String("3u")); - QCOMPARE(valueA0->value(), (int) 3u); + QCOMPARE(valueA0->value().unsignedValue(), 3u); AbstractMetaEnumValue* valueA1 = enumA->values().at(1); QCOMPARE(valueA1->name(), QLatin1String("ValueA1")); QCOMPARE(valueA1->stringValue(), QLatin1String("~3u")); - QCOMPARE(valueA1->value(), (int) ~3u); + QCOMPARE(valueA1->value().unsignedValue(), ~3u); AbstractMetaEnumValue* valueA2 = enumA->values().at(2); QCOMPARE(valueA2->name(), QLatin1String("ValueA2")); - QCOMPARE(valueA2->stringValue(), QLatin1String("~3")); - QCOMPARE(valueA2->value(), ~3); + QCOMPARE(valueA2->stringValue(), QLatin1String("0xffffffff")); + QCOMPARE(valueA2->value().unsignedValue(), 0xffffffffu); AbstractMetaEnumValue* valueA3 = enumA->values().at(3); QCOMPARE(valueA3->name(), QLatin1String("ValueA3")); QCOMPARE(valueA3->stringValue(), QLatin1String("0xf0")); - QCOMPARE(valueA3->value(), 0xf0); + QCOMPARE(valueA3->value().unsignedValue(), 0xf0u); AbstractMetaEnumValue* valueA4 = enumA->values().at(4); QCOMPARE(valueA4->name(), QLatin1String("ValueA4")); QCOMPARE(valueA4->stringValue(), QLatin1String("8 |ValueA3")); - QCOMPARE(valueA4->value(), 8|0xf0); + QCOMPARE(valueA4->value().unsignedValue(), 8|0xf0u); AbstractMetaEnumValue* valueA5 = enumA->values().at(5); QCOMPARE(valueA5->name(), QLatin1String("ValueA5")); QCOMPARE(valueA5->stringValue(), QLatin1String("ValueA3|32")); - QCOMPARE(valueA5->value(), 0xf0|32); + QCOMPARE(valueA5->value().unsignedValue(), 0xf0u|32); AbstractMetaEnumValue* valueA6 = enumA->values().at(6); QCOMPARE(valueA6->name(), QLatin1String("ValueA6")); QCOMPARE(valueA6->stringValue(), QLatin1String("ValueA3 >> 1")); - QCOMPARE(valueA6->value(), 0xf0 >> 1); + QCOMPARE(valueA6->value().unsignedValue(), 0xf0u >> 1); AbstractMetaEnumValue* valueA7 = enumA->values().at(7); QCOMPARE(valueA7->name(), QLatin1String("ValueA7")); QCOMPARE(valueA7->stringValue(), QLatin1String("ValueA3 << 1")); - QCOMPARE(valueA7->value(), 0xf0 << 1); + QCOMPARE(valueA7->value().unsignedValue(), 0xf0u << 1); + + const AbstractMetaEnum *enumB = classA->findEnum(QLatin1String("EnumB")); + QVERIFY(enumB); + QVERIFY(enumB->isSigned()); + QCOMPARE(enumB->typeEntry()->qualifiedCppName(), QLatin1String("A::EnumB")); + QCOMPARE(enumB->values().size(), 1); + const AbstractMetaEnumValue *valueB0 = enumB->values().at(0); + QCOMPARE(valueB0->name(), QLatin1String("ValueB0")); + QCOMPARE(valueB0->stringValue(), QLatin1String("~3")); + QCOMPARE(valueB0->value().value(), ~3); } void TestEnum::testPrivateEnum() @@ -375,12 +390,12 @@ void TestEnum::testPrivateEnum() AbstractMetaEnumValue* pub0 = publicEnum->values().first(); QCOMPARE(pub0->name(), QLatin1String("Pub0")); - QCOMPARE(pub0->value(), 0x0f); + QCOMPARE(pub0->value().value(), 0x0f); QCOMPARE(pub0->stringValue(), QLatin1String("Priv0")); AbstractMetaEnumValue* pub1 = publicEnum->values().last(); QCOMPARE(pub1->name(), QLatin1String("Pub1")); - QCOMPARE(pub1->value(), 0xf0); + QCOMPARE(pub1->value().value(), 0xf0); QCOMPARE(pub1->stringValue(), QLatin1String("A::Priv1")); } @@ -408,12 +423,12 @@ void TestEnum::testTypedefEnum() AbstractMetaEnumValue* enumValueA0 = enumA->values().first(); QCOMPARE(enumValueA0->name(), QLatin1String("A0")); - QCOMPARE(enumValueA0->value(), 0); + QCOMPARE(enumValueA0->value().value(), 0); QCOMPARE(enumValueA0->stringValue(), QLatin1String("")); AbstractMetaEnumValue* enumValueA1 = enumA->values().last(); QCOMPARE(enumValueA1->name(), QLatin1String("A1")); - QCOMPARE(enumValueA1->value(), 1); + QCOMPARE(enumValueA1->value().value(), 1); QCOMPARE(enumValueA1->stringValue(), QString()); } diff --git a/sources/shiboken2/ApiExtractor/typesystem.cpp b/sources/shiboken2/ApiExtractor/typesystem.cpp index 600536aba..0a47b9b17 100644 --- a/sources/shiboken2/ApiExtractor/typesystem.cpp +++ b/sources/shiboken2/ApiExtractor/typesystem.cpp @@ -963,11 +963,6 @@ bool Handler::startElement(const QStringRef &n, const QXmlStreamAttributes &atts m_currentEnum = new EnumTypeEntry(QStringList(names.mid(0, names.size() - 1)).join(colonColon()), names.constLast(), since); - if (!attributes.value(enumIdentifiedByValueAttribute()).isEmpty()) { - m_currentEnum->setEnumKind(EnumTypeEntry::AnonymousEnum); - } else if (convertBoolean(attributes.value(classAttribute()), classAttribute(), false)) { - m_currentEnum->setEnumKind(EnumTypeEntry::EnumClass); - } element->entry = m_currentEnum; m_currentEnum->setCodeGeneration(m_generate); m_currentEnum->setTargetLangPackage(m_defaultPackage); diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h index 2f534c93d..eae064134 100644 --- a/sources/shiboken2/ApiExtractor/typesystem.h +++ b/sources/shiboken2/ApiExtractor/typesystem.h @@ -1041,12 +1041,6 @@ private: class EnumTypeEntry : public TypeEntry { public: - enum EnumKind { - CEnum, // Standard C: enum Foo { value1, value2 } - AnonymousEnum, // enum { value1, value2 } - EnumClass // C++ 11 : enum class Foo { value1, value2 } - }; - explicit EnumTypeEntry(const QString &nspace, const QString &enumName, const QVersionNumber &vr); @@ -1068,9 +1062,6 @@ public: m_qualifier = q; } - EnumKind enumKind() const { return m_enumKind; } - void setEnumKind(EnumKind kind) { m_enumKind = kind; } - bool preferredConversion() const override; bool isBoundsChecked() const @@ -1136,8 +1127,6 @@ public: m_forceInteger = force; } - bool isAnonymous() const { return m_enumKind == AnonymousEnum; } - private: QString m_packageName; QString m_qualifier; @@ -1150,8 +1139,6 @@ private: FlagsTypeEntry *m_flags = nullptr; - EnumKind m_enumKind = CEnum; - bool m_extensible = false; bool m_forceInteger = false; }; diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt index e774a172b..b65e32974 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -56,6 +56,9 @@ endmacro() set(CLANG_DIR "") set(CLANG_DIR_SOURCE "") +set(clang_not_found_message "Unable to detect CLANG location by checking LLVM_INSTALL_DIR, \ + CLANG_INSTALL_DIR or running llvm-config.") + if (DEFINED ENV{LLVM_INSTALL_DIR}) set(CLANG_DIR $ENV{LLVM_INSTALL_DIR}) string(REPLACE "_ARCH_" "${PYTHON_ARCH}" CLANG_DIR "${CLANG_DIR}") @@ -69,6 +72,10 @@ else () get_llvm_config() endif() set(CLANG_DIR_SOURCE "${LLVM_CONFIG}") + if ("${CLANG_DIR_SOURCE}" STREQUAL "") + message(FATAL_ERROR "${clang_not_found_message}") + endif() + EXEC_PROGRAM("${LLVM_CONFIG}" ARGS "--prefix" OUTPUT_VARIABLE CLANG_DIR) if (NOT "${CLANG_DIR}" STREQUAL "") EXEC_PROGRAM("${LLVM_CONFIG}" ARGS "--version" OUTPUT_VARIABLE CLANG_VERSION) @@ -79,7 +86,7 @@ else () endif() if ("${CLANG_DIR}" STREQUAL "") - message(FATAL_ERROR "Unable to detect CLANG location by checking LLVM_INSTALL_DIR, CLANG_INSTALL_DIR or running llvm-config.") + message(FATAL_ERROR "${clang_not_found_message}") elseif (NOT IS_DIRECTORY ${CLANG_DIR}) message(FATAL_ERROR "${CLANG_DIR} detected by ${CLANG_DIR_SOURCE} does not exist.") endif() diff --git a/sources/shiboken2/doc/README.md b/sources/shiboken2/doc/README.md new file mode 100644 index 000000000..2575eafd2 --- /dev/null +++ b/sources/shiboken2/doc/README.md @@ -0,0 +1,12 @@ +# Shiboken Documentation + +The documentation was written and needs to be generated +with [python-sphinx](http://www.sphinx-doc.org/en/master/) + +### Images + +The SVG diagrams use the Qt color scheme. +The font also follows Qt styling, and it is called `Titillium`. +It can be download from: +* https://fonts.google.com/specimen/Titillium+Web +* https://www.fontsquirrel.com/fonts/Titillium diff --git a/sources/shiboken2/doc/codeinjectionsemantics.rst b/sources/shiboken2/doc/codeinjectionsemantics.rst index d748a3aae..bf3ddbe5e 100644 --- a/sources/shiboken2/doc/codeinjectionsemantics.rst +++ b/sources/shiboken2/doc/codeinjectionsemantics.rst @@ -2,11 +2,12 @@ Code Injection Semantics ************************ -API Extractor provides the `inject-code -<http://www.pyside.org/docs/apiextractor/typesystem_manipulating_objects.html#inject-code>`_ tag -allowing the user to put custom written code to on specific locations of the generated code. -Yet this is only part of what is needed to generate proper binding code, where the custom code -should be written to depends upon the technology used on the generated binding code. +API Extractor provides the `inject-code`_ tag allowing the user to put custom +written code to on specific locations of the generated code. +Yet this is only part of what is needed to generate proper binding code, where +the custom code should be written to depends upon the technology used on the +generated binding code. + This is the ``inject-code`` tag options that matters to |project|. @@ -16,6 +17,7 @@ This is the ``inject-code`` tag options that matters to |project|. // custom code </inject-code> + Conventions =========== @@ -86,7 +88,7 @@ The following table describes the semantics of ``inject-code`` tag as used on | | | |signature. | | +------+---------+--------------------------------------------------------------+ | |shell |beginning|Used only for virtual functions. The code is injected when the| - | | | |function does not has a pyhton implementation, then the code | + | | | |function does not has a Python implementation, then the code | | | | |is inserted before c++ call | | | +---------+--------------------------------------------------------------+ | | |end |Same as above, but the code is inserted after c++ call | @@ -158,7 +160,7 @@ If the argument is removed and no default value is provided, the generator will not write any call to the method and expect the ``modify-function - target/beginning`` code injection to call the original C++ method on its own terms. If even this custom code is not provided the generator will put an ``#error`` clause to -prevent compilation of erroneus binding code. +prevent compilation of erroneous binding code. Calling the method with your own hands always! ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -352,7 +354,7 @@ Code injections to the class Python initialization function. Code Injection for Modules ========================== -The C++ libraries are wapped as Python modules, a collection of classes, +The C++ libraries are wrapped as Python modules, a collection of classes, functions, enums and namespaces. |project| creates wrapper files for all of them and also one extra ``MODULENAME_module_wrapper.cpp`` to register the whole module. Code injection xml tags who have the ``typesystem`` tag as parent will @@ -395,3 +397,5 @@ to prevent bad custom code to pass unnoticed. // Start of ``MODULENAME_module_wrapper.cpp`` + +.. _`inject-code`: http://www.pyside.org/docs/apiextractor/typesystem_manipulating_objects.html#inject-code diff --git a/sources/shiboken2/doc/dependency-pyqtb.svg b/sources/shiboken2/doc/dependency-pyqtb.svg deleted file mode 100644 index a458bf6fb..000000000 --- a/sources/shiboken2/doc/dependency-pyqtb.svg +++ /dev/null @@ -1,600 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="800" - height="340" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.46" - version="1.0" - sodipodi:docname="dependency-pyqtb.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/var/www/lauro/dependency-pyqtb.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs4"> - <marker - inkscape:stockid="Arrow1Lstart" - orient="auto" - refY="0" - refX="0" - id="Arrow1Lstart" - style="overflow:visible"> - <path - id="path3270" - d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - transform="matrix(0.8,0,0,0.8,10,0)" /> - </marker> - <marker - inkscape:stockid="Arrow1Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow1Lend" - style="overflow:visible"> - <path - id="path3679" - d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - transform="matrix(-0.8,0,0,-0.8,-10,0)" /> - </marker> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - id="perspective10" /> - <inkscape:perspective - id="perspective3480" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 526.18109 : 1" - sodipodi:type="inkscape:persp3d" /> - <inkscape:perspective - id="perspective3498" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 526.18109 : 1" - sodipodi:type="inkscape:persp3d" /> - <inkscape:perspective - id="perspective3541" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 526.18109 : 1" - sodipodi:type="inkscape:persp3d" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.0425" - inkscape:cx="400" - inkscape:cy="170" - inkscape:document-units="px" - inkscape:current-layer="g3995" - showgrid="false" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-width="1280" - inkscape:window-height="951" - inkscape:window-x="0" - inkscape:window-y="25" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-94.976306,-355.09425)" /> - <g - id="g4087" - transform="translate(2.4157429e-6,1.9999951)"> - <g - id="g3995" - transform="translate(6,-3.2661035e-8)"> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.66823119px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Lstart);marker-end:none;stroke-opacity:1" - d="M 281.95594,47.06539 L 314.12853,47.06538" - id="path2877" - inkscape:connector-type="polyline" /> - <g - id="g3801" - transform="translate(-9.3125054,-154.20033)"> - <rect - y="286.49988" - x="322.2547" - height="73.367416" - width="194.85175" - id="rect3595" - style="fill:#9ac5ff;fill-opacity:1;fill-rule:evenodd;stroke:#003378;stroke-width:0.8142156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - ry="10.318988" - rx="8.598484" /> - <g - transform="translate(1.7229236,-30.915768)" - id="g3599"> - <text - xml:space="preserve" - style="font-size:16.27989578px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="336.95081" - id="text2443"><tspan - sodipodi:role="line" - id="tspan2445" - x="329.46826" - y="336.95081">API Extractor</tspan></text> - <text - xml:space="preserve" - style="font-size:8.40044498px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="352.61548" - id="text2447"><tspan - sodipodi:role="line" - id="tspan2449" - x="329.46826" - y="352.61548">0.2</tspan></text> - <text - xml:space="preserve" - style="font-size:9.33067703px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="368.15546" - id="text2451"><tspan - sodipodi:role="line" - x="329.46826" - y="368.15546" - id="tspan2453">Headers and libraries - compile-time</tspan></text> - <text - xml:space="preserve" - style="font-size:8.26250458px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="383.47839" - id="text2455"><tspan - sodipodi:role="line" - id="tspan2457" - x="329.46826" - y="383.47839">LGPL version 2.1</tspan></text> - </g> - </g> - <g - id="g3729" - transform="translate(-9.3125054,-153.6367)"> - <rect - y="164.01837" - x="322.2547" - height="73.367416" - width="194.85175" - id="rect2459" - style="fill:#9ac5ff;fill-opacity:1;fill-rule:evenodd;stroke:#003378;stroke-width:0.8142156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - ry="10.318988" - rx="8.598484" /> - <g - transform="translate(3.673984,2.3276517)" - id="g3585"> - <text - xml:space="preserve" - style="font-size:16.27989578px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="181.23659" - id="text2461"><tspan - sodipodi:role="line" - id="tspan2463" - x="329.46826" - y="181.23659">Shiboken (generator)</tspan></text> - <text - xml:space="preserve" - style="font-size:8.40044498px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="196.90126" - id="text2465"><tspan - sodipodi:role="line" - id="tspan2467" - x="329.46826" - y="196.90126">0.1</tspan></text> - <text - xml:space="preserve" - style="font-size:9.33067703px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="212.44124" - id="text2469"><tspan - sodipodi:role="line" - x="329.46826" - y="212.44124" - id="tspan2471">Binary executable - compile-time</tspan></text> - <text - xml:space="preserve" - style="font-size:8.26250458px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="227.76418" - id="text2473"><tspan - sodipodi:role="line" - id="tspan2475" - x="329.46826" - y="227.76418">GPL version 2</tspan></text> - </g> - </g> - <g - id="g3789" - transform="translate(-9.3125054,-154.20033)"> - <rect - y="406.48441" - x="322.2547" - height="73.367416" - width="194.85175" - id="rect3597" - style="fill:#f3a6a6;fill-opacity:1;fill-rule:evenodd;stroke:#6a0e0e;stroke-width:0.8142156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - ry="10.318988" - rx="8.598484" /> - <g - transform="translate(-0.7447933,-64)" - id="g3633"> - <text - xml:space="preserve" - style="font-size:16.27989578px;font-style:normal;font-weight:normal;fill:#350707;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="489.09369" - id="text2565"><tspan - sodipodi:role="line" - id="tspan2567" - x="329.46826" - y="489.09369">boost::graph</tspan></text> - <text - xml:space="preserve" - style="font-size:8.40044498px;font-style:normal;font-weight:normal;fill:#350707;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="504.75836" - id="text2569"><tspan - sodipodi:role="line" - id="tspan2571" - x="329.46826" - y="504.75836">1.38.0</tspan></text> - <text - xml:space="preserve" - style="font-size:9.33067703px;font-style:normal;font-weight:normal;fill:#350707;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="520.29834" - id="text2573"><tspan - sodipodi:role="line" - x="329.46826" - y="520.29834" - id="tspan2575">headers and libraries - compile-time</tspan></text> - <text - xml:space="preserve" - style="font-size:8.26250458px;font-style:normal;font-weight:normal;fill:#350707;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="535.62128" - id="text2577"><tspan - sodipodi:role="line" - id="tspan2579" - x="329.46826" - y="535.62128">Boost Software License 1.0</tspan></text> - </g> - </g> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.77180147px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Lstart);marker-end:none;stroke-opacity:1" - d="M 410.36806,130.70564 L 410.36806,83.52386" - id="path2879" - inkscape:connector-type="polyline" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.77360356px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Lstart);marker-mid:none;marker-end:none;stroke-opacity:1" - d="M 410.36806,252.57322 L 410.36806,207.23899" - id="path2881" - inkscape:connector-type="polyline" /> - <g - id="g3565" - transform="translate(1.4608973,-106.88798)"> - <rect - ry="22.567146" - y="268.8403" - x="6.7667637" - height="163.45378" - width="273.78238" - id="rect7541" - style="fill:#e3e2db;stroke:#000000;stroke-width:1.30499184;stroke-opacity:1" - rx="22.567146" /> - <g - transform="translate(0.2849671,3.2991583)" - id="g3547"> - <g - id="g3516" - transform="translate(0,63.999998)"> - <text - id="text7543" - y="339.74512" - x="76.614265" - style="font-size:20.61732101px;font-style:normal;font-weight:normal;fill:#350707;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - xml:space="preserve"><tspan - y="339.74512" - x="76.614265" - id="tspan7545" - sodipodi:role="line">Boost</tspan></text> - <rect - ry="6.4285707" - y="321.55374" - x="21.614267" - height="22.5" - width="43.163269" - id="rect7555" - style="fill:#f3a6a6;fill-opacity:1;stroke:#6a0e0e;stroke-width:0.64285713;stroke-opacity:1" - rx="6.4285707" /> - </g> - <g - id="g3521" - transform="translate(0,-2.9523642)"> - <text - id="text7547" - y="372.67505" - x="76.614265" - style="font-size:20.61732101px;font-style:normal;font-weight:normal;fill:#1c2d0f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - xml:space="preserve"><tspan - y="372.67505" - x="76.614265" - id="tspan7549" - sodipodi:role="line">Qt Software</tspan></text> - <rect - ry="6.4285707" - y="355.4823" - x="21.614267" - height="22.5" - width="43.163269" - id="rect7561" - style="fill:#97ce6c;fill-opacity:1;stroke:#385a1e;stroke-width:0.64285713;stroke-opacity:1" - rx="6.4285707" /> - </g> - <g - id="g3486" - transform="translate(0,2.8342009e-5)"> - <text - id="text7551" - y="304.38055" - x="76.614265" - style="font-size:20.61732101px;font-style:normal;font-weight:normal;fill:#00193c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - xml:space="preserve"><tspan - y="304.38055" - x="76.614265" - id="tspan7553" - sodipodi:role="line">INdT/Nokia</tspan></text> - <rect - ry="6.4285707" - y="286.4823" - x="21.614267" - height="22.5" - width="43.163269" - id="rect7563" - style="fill:#9ac5ff;fill-opacity:1;stroke:#003378;stroke-width:0.64285713;stroke-opacity:1" - rx="6.4285707" /> - </g> - <g - id="g3526" - transform="translate(-1.3182277,-35.976168)" - style="fill:#ffe052;fill-opacity:1"> - <text - id="text3528" - y="372.67505" - x="76.614265" - style="font-size:20.61732101px;font-style:normal;font-weight:normal;fill:#3c3100;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - xml:space="preserve"><tspan - y="372.67505" - x="76.614265" - id="tspan3530" - sodipodi:role="line">Python Foundation</tspan></text> - <rect - ry="6.4285707" - y="355.4823" - x="21.614267" - height="22.5" - width="43.163269" - id="rect3532" - style="fill:#ffe052;fill-opacity:1;stroke:#786200;stroke-width:0.64285713;stroke-opacity:1" - rx="6.4285707" /> - </g> - </g> - </g> - <g - id="g3717" - transform="translate(232.28126,-66.767457)"> - <rect - y="77.149132" - x="322.2547" - height="73.367416" - width="194.85175" - id="rect3657" - style="fill:#9ac5ff;fill-opacity:1;fill-rule:evenodd;stroke:#003378;stroke-width:0.8142156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - ry="10.318988" - rx="8.598484" /> - <g - transform="translate(4.8773009,-84.541588)" - id="g3659"> - <text - xml:space="preserve" - style="font-size:16.27989578px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="181.23659" - id="text3661"><tspan - sodipodi:role="line" - id="tspan3663" - x="329.46826" - y="181.23659">libshiboken</tspan></text> - <text - xml:space="preserve" - style="font-size:8.40044498px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="196.90126" - id="text3665"><tspan - sodipodi:role="line" - id="tspan3667" - x="329.46826" - y="196.90126">0.1</tspan></text> - <text - xml:space="preserve" - style="font-size:9.33067703px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="212.44124" - id="text3669"><tspan - sodipodi:role="line" - x="329.46826" - y="212.44124" - id="tspan3671">Headers and libraries - compile-time</tspan></text> - <text - xml:space="preserve" - style="font-size:8.26250458px;font-style:normal;font-weight:normal;fill:#00183c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="227.76418" - id="text3673"><tspan - sodipodi:role="line" - id="tspan3675" - x="329.46826" - y="227.76418">LGPL version 2.1</tspan></text> - </g> - </g> - <g - id="g3752" - transform="translate(-10.802055,-155.79173)"> - <rect - rx="8.3239012" - y="166.21593" - x="18.860012" - height="73.282379" - width="274.18781" - id="rect2417" - style="fill:#97ce6c;fill-opacity:1;fill-rule:evenodd;stroke:#385a1e;stroke-width:0.96558368px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - ry="9.2689295" /> - <g - id="g3741"> - <text - xml:space="preserve" - style="font-size:16.27989578px;font-style:normal;font-weight:normal;fill:#1c2d0f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="29.111408" - y="183.02223" - id="text2419"><tspan - sodipodi:role="line" - id="tspan2421" - x="29.111408" - y="183.02223">Qt 4.5</tspan></text> - <text - xml:space="preserve" - style="font-size:8.40044498px;font-style:normal;font-weight:normal;fill:#1c2d0f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="29.111408" - y="198.68694" - id="text2423"><tspan - sodipodi:role="line" - id="tspan2425" - x="29.111408" - y="198.68694">4.5</tspan></text> - <text - xml:space="preserve" - style="font-size:9.33067703px;font-style:normal;font-weight:normal;fill:#1c2d0f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="29.111408" - y="214.22688" - id="text2427"><tspan - sodipodi:role="line" - id="tspan2429" - x="29.111408" - y="214.22688">headers and libraries - compile-time and run-time</tspan></text> - <text - xml:space="preserve" - style="font-size:8.26250458px;font-style:normal;font-weight:normal;fill:#1c2d0f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="29.111408" - y="224.19267" - id="text2431"><tspan - sodipodi:role="line" - id="tspan2433" - x="29.111408" - y="224.19267">GNU General Public License v3 /</tspan><tspan - id="tspan2472" - sodipodi:role="line" - x="29.111408" - y="234.5208">GNU Lesser General Public Licence v2.1</tspan></text> - </g> - </g> - <g - id="g3765" - transform="translate(201.65125,55.15042)"> - <rect - y="77.208275" - x="322.31384" - height="73.24913" - width="255.99348" - id="rect3767" - style="fill:#ffe052;fill-opacity:1;fill-rule:evenodd;stroke:#786200;stroke-width:0.93250537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - ry="10.318988" - rx="8.598484" /> - <g - transform="translate(4.8773009,-84.541588)" - id="g3769"> - <text - xml:space="preserve" - style="font-size:16.27989578px;font-style:normal;font-weight:normal;fill:#3c3100;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="181.23659" - id="text3771"><tspan - sodipodi:role="line" - id="tspan3773" - x="329.46826" - y="181.23659">Python</tspan></text> - <text - xml:space="preserve" - style="font-size:8.40044498px;font-style:normal;font-weight:normal;fill:#3c3100;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="196.90126" - id="text3775"><tspan - sodipodi:role="line" - id="tspan3777" - x="329.46826" - y="196.90126">2.6</tspan></text> - <text - xml:space="preserve" - style="font-size:9.33067703px;font-style:normal;font-weight:normal;fill:#3c3100;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="212.44124" - id="text3779"><tspan - sodipodi:role="line" - x="329.46826" - y="212.44124" - id="tspan3781">Headers and libraries - compile-time and run-time</tspan></text> - <text - xml:space="preserve" - style="font-size:8.26250458px;font-style:normal;font-weight:normal;fill:#3c3100;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="329.46826" - y="227.76418" - id="text3783"><tspan - sodipodi:role="line" - id="tspan3785" - x="329.46826" - y="227.76418">Python license</tspan></text> - </g> - </g> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.77180147px;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#Arrow1Lstart);marker-end:none;stroke-opacity:1" - d="M 651.96184,131.80908 L 651.96184,84.6273" - id="path3787" - inkscape:connector-type="polyline" /> - </g> - </g> -</svg> diff --git a/sources/shiboken2/doc/faq.rst b/sources/shiboken2/doc/faq.rst index 77e0fbdfc..4b2bf9eea 100644 --- a/sources/shiboken2/doc/faq.rst +++ b/sources/shiboken2/doc/faq.rst @@ -2,8 +2,8 @@ Frequently Asked Questions ************************** -This is a list of Frequently Asked Questions about |project|. Feel free to -suggest new entries! +This is a list of Frequently Asked Questions about |project|. +Feel free to suggest new entries using our `Mailing list`_ or our IRC channel! General ======= @@ -11,17 +11,20 @@ General What is Shiboken? ----------------- -Shiboken is a `GeneratorRunner <http://www.pyside.org/home-binding/binding-generator>`_ -plugin that outputs C++ code for CPython extensions. The first version of PySide -had source code based on Boost templates. It was easier to produce code but a -paradigm change was needed, as the next question explains. +Shiboken is a `GeneratorRunner`_ that outputs C++ code for CPython +extensions. +The first version of PySide had source code based on Boost templates. +It was easier to produce code but a paradigm change was needed, as the next +question explains. + Why did you switch from Boost.Python to Shiboken? ------------------------------------------------- -The main reason was the size reduction. Boost.Python makes excessive use of templates -resulting in a significant increase of the binaries size. On the other hand, as Shiboken -generates CPython code, the resulting binaries are smaller. +The main reason was the size reduction. Boost.Python makes excessive use of +templates resulting in a significant increase of the binaries size. +On the other hand, as Shiboken generates CPython code, the resulting binaries +are smaller. Creating bindings ================= @@ -41,13 +44,12 @@ and the C++ library that is being wrapped. What do I have to do to create my bindings? ------------------------------------------- -.. todo: put link to typesystem documentation +Most of the work is already done by the API Extractor. +The developer creates a `typesystem`_ file with any customization wanted in +the generated code, like removing classes or changing method signatures. +The generator will output the *.h* and *.cpp* files with the CPython code that +will wrap the target library for python. -Most of the work is already done by the API Extractor. The developer creates -a `typesystem <http://www.pyside.org/docs/apiextractor/typesystem.html>`_ file -with any customization wanted in the generated code, like removing classes or -changing method signatures. The generator will output the .h and .cpp files -with the CPython code that will wrap the target library for python. Is there any recommended build system? -------------------------------------- @@ -63,5 +65,8 @@ What is 'inject code'? ---------------------- That's how we call customized code that will be *injected* into the -generated at specific locations. They are specified inside the typesytem. +generated at specific locations. They are specified inside the typesystem. +.. _`Mailing list`: http://lists.qt-project.org/mailman/listinfo/pyside +.. _`GeneratorRunner`: http://www.pyside.org/home-binding/binding-generator +.. _`typesystem`: http://www.pyside.org/docs/apiextractor/typesystem.html diff --git a/sources/shiboken2/doc/images/bindinggen-development.png b/sources/shiboken2/doc/images/bindinggen-development.png Binary files differindex 2dd64ba1d..5931b126a 100644 --- a/sources/shiboken2/doc/images/bindinggen-development.png +++ b/sources/shiboken2/doc/images/bindinggen-development.png diff --git a/sources/shiboken2/doc/images/bindinggen-development.svg b/sources/shiboken2/doc/images/bindinggen-development.svg index 3b6b3a26e..591e1f2d1 100644 --- a/sources/shiboken2/doc/images/bindinggen-development.svg +++ b/sources/shiboken2/doc/images/bindinggen-development.svg @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" @@ -12,9 +13,9 @@ height="200" id="svg2" sodipodi:version="0.32" - inkscape:version="0.46" + inkscape:version="0.92.2 2405546, 2018-03-11" version="1.0" - sodipodi:docname="bindgen-development.svg" + sodipodi:docname="bindinggen-development.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="bindinggen-development.png" inkscape:export-xdpi="90" @@ -140,22 +141,24 @@ objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.0859375" - inkscape:cx="320" - inkscape:cy="136.17463" + inkscape:zoom="0.76787377" + inkscape:cx="286.61779" + inkscape:cy="101.18182" inkscape:document-units="px" - inkscape:current-layer="g5658" + inkscape:current-layer="g5440" showgrid="false" - inkscape:window-width="1156" - inkscape:window-height="883" - inkscape:window-x="1396" - inkscape:window-y="35" + inkscape:window-width="1116" + inkscape:window-height="1042" + inkscape:window-x="10" + inkscape:window-y="28" showguides="true" - inkscape:guide-bbox="true"> + inkscape:guide-bbox="true" + inkscape:window-maximized="0"> <sodipodi:guide orientation="1,0" position="-557.55608,678.10875" - id="guide7299" /> + id="guide7299" + inkscape:locked="false" /> </sodipodi:namedview> <metadata id="metadata7"> @@ -176,7 +179,7 @@ <flowRoot xml:space="preserve" id="flowRoot3229" - style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + style="font-style:normal;font-weight:normal;line-height:0.01%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" transform="translate(4.1137413,-2.3429609)"><flowRegion id="flowRegion3231"><rect id="rect3233" @@ -184,166 +187,269 @@ height="40.5849" x="388.45547" y="279.5423" /></flowRegion><flowPara - id="flowPara3235" /></flowRoot> <g + id="flowPara3235" + style="font-size:40px;line-height:1.25">Â </flowPara></flowRoot> <g id="g5658" transform="translate(6.5767925,7.0112479)"> <g - id="g5634"> + transform="matrix(0,-1,1,0,697.50638,3244.256)" + id="g5624" + style=""> + <g + id="g5626" + transform="matrix(0,-1,1,0,-294.81158,2953.0504)" + style=""> + <path + sodipodi:nodetypes="cc" + inkscape:connector-type="polyline" + id="path5628" + d="m 1586.5317,1348.2858 0.091,41.5266" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + inkscape:connector-curvature="0" /> + <path + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + d="m 1586.7489,1389.4756 7.9979,-9.1068" + id="path5630" + inkscape:connector-type="polyline" + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + <path + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + d="m 1586.6031,1389.5063 -7.9979,-9.1069" + id="path5632" + inkscape:connector-type="polyline" + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + transform="matrix(0,-1,1,0,908.50929,3242.9612)" + id="g5648" + style=""> + <g + id="g5650" + transform="matrix(0,-1,1,0,-294.81158,2953.0504)" + style=""> + <path + sodipodi:nodetypes="cc" + inkscape:connector-type="polyline" + id="path5652" + d="m 1586.5317,1348.2858 0.091,41.5266" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + inkscape:connector-curvature="0" /> + <path + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + d="m 1586.7489,1389.4756 7.9979,-9.1068" + id="path5654" + inkscape:connector-type="polyline" + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + <path + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + d="m 1586.6031,1389.5063 -7.9979,-9.1069" + id="path5656" + inkscape:connector-type="polyline" + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + </g> + </g> + <g + id="g5634" + style=""> <g id="g6271" - transform="translate(1086.3689,746.93837)"> + transform="translate(1086.3689,746.93837)" + style=""> <g transform="matrix(0,-1,1,0,-294.81158,2953.0504)" - id="g6252"> + id="g6252" + style=""> <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" - d="M 1586.5317,1300.2858 L 1586.6222,1389.8124" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + d="m 1586.5317,1300.2858 0.091,89.5266" id="path11089" inkscape:connector-type="polyline" - sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="cc" inkscape:connector-type="polyline" id="path2758" - d="M 1586.7489,1389.4756 L 1594.7468,1380.3688" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" /> + d="m 1586.7489,1389.4756 7.9979,-9.1068" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="cc" inkscape:connector-type="polyline" id="path2760" - d="M 1586.6031,1389.5063 L 1578.6052,1380.3994" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" /> + d="m 1586.6031,1389.5063 -7.9979,-9.1069" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + inkscape:connector-curvature="0" /> </g> </g> </g> <g - transform="translate(134.35978,44.472131)" - id="g2777"> - <rect - style="fill:#addc52;fill-opacity:1;stroke:#6ca400;stroke-width:0.82399696;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect5172" - width="185.49777" - height="75.08918" - x="2047.775" - y="2029.4594" - ry="3.0323718" - rx="2.6724329" /> - <text - xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="2140.5562" - y="2062.9375" - id="text5174"><tspan - sodipodi:role="line" - x="2140.5562" - y="2062.9375" - style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold" - id="tspan5176">Qt bindings</tspan><tspan - id="tspan6109" - sodipodi:role="line" - x="2140.5562" - y="2084.457" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">(generated code)</tspan></text> - </g> - <g - transform="translate(141.86951,-31.391207)" - id="g3216"> - <rect - style="fill:#bff3bc;fill-opacity:1;stroke:#0af400;stroke-width:0.64492828;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3625" - width="185.67708" - height="75.268074" - x="1829.1727" - y="2105.2332" - ry="2.3353095" - rx="2.1257713" /> - <text - xml:space="preserve" - style="font-size:38.71272278px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="1921.9705" - y="2136.9409" - id="text3627" - transform="scale(1.0000266,0.9999734)"><tspan - id="tspan3697" - sodipodi:role="line" - x="1921.9705" - y="2136.9409" - style="font-size:21.29199791px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold">generator</tspan><tspan - sodipodi:role="line" - x="1921.9705" - y="2163.5559" - style="font-size:21.29199791px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#035800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold" - id="tspan2464">front-end</tspan></text> - </g> - <g - id="g5641"> + id="g5641" + style=""> <g id="g5465" - transform="translate(874.42628,746.93837)"> + transform="translate(874.42628,746.93837)" + style=""> <g transform="matrix(0,-1,1,0,-294.81158,2953.0504)" - id="g5467"> + id="g5467" + style=""> <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" - d="M 1586.5317,1300.2858 L 1586.6222,1389.8124" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + d="m 1586.5317,1300.2858 0.091,89.5266" id="path5469" inkscape:connector-type="polyline" - sodipodi:nodetypes="cc" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="cc" inkscape:connector-type="polyline" id="path5471" - d="M 1586.7489,1389.4756 L 1594.7468,1380.3688" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" /> + d="m 1586.7489,1389.4756 7.9979,-9.1068" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + inkscape:connector-curvature="0" /> <path sodipodi:nodetypes="cc" inkscape:connector-type="polyline" id="path5473" - d="M 1586.6031,1389.5063 L 1578.6052,1380.3994" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" /> + d="m 1586.6031,1389.5063 -7.9979,-9.1069" + style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:none" + inkscape:connector-curvature="0" /> </g> </g> </g> <g transform="translate(-194.79968,-212.08495)" id="g5440"> - <rect - rx="1.2158648" - ry="2.9911308" - y="2285.8806" - x="1953.809" - height="75.360634" - width="185.76964" - id="rect3166" - style="fill:#dfe994;fill-opacity:1;stroke:#d5f400;stroke-width:0.55236381;stroke-opacity:1" /> + <path + style="fill:#41cd52;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2378.6251,2292.247 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z" + id="path3715-5-6-7-9-8-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.29069424px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="2471.614" + y="2309.093" + id="text5174"><tspan + sodipodi:role="line" + x="2471.614" + y="2309.093" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.29069424px;" + id="tspan953">Qt for Python</tspan><tspan + id="tspan6109" + sodipodi:role="line" + x="2471.614" + y="2339.093" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.29069424px;">(generated code)</tspan></text> + <path + style="fill:#6b7080;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2166.5963,2292.247 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z" + id="path3715-5-6-7-9-8-7-9-94" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.50930572px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="2259.1294" + y="2311.0505" + id="text3627" + transform="scale(1.0000266,0.9999734)"><tspan + id="tspan3697" + sodipodi:role="line" + x="2259.1294" + y="2311.0505" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.50930572px;">generator</tspan><tspan + sodipodi:role="line" + x="2259.1294" + y="2341.0505" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.50930572px;" + id="tspan2464">front-end</tspan></text> + <path + style="fill:#6b7080;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1959.8625,2292.2469 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z" + id="path3715-5-6-7-9-8-7-9-1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> <text id="text3168" - y="2328.8809" - x="2046.646" - style="font-size:27.94354057px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + y="2326.4568" + x="2052.7678" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.65129721px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" xml:space="preserve"><tspan - style="font-size:19.56047821px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - y="2328.8809" - x="2046.646" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.65129721px;" + y="2326.4568" + x="2052.7678" sodipodi:role="line" id="tspan5424">API Extractor</tspan></text> + <path + style="fill:#9d9faa;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2378.6251,2393.0867 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z" + id="path3715-5-6-7-9-8-7-9-9" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + id="text3487" + y="2410.3647" + x="2471.614" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.44197154px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + xml:space="preserve"><tspan + id="tspan2509" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.44197154px;" + y="2410.3647" + x="2471.614" + sodipodi:role="line">typesystem</tspan><tspan + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.44197154px;" + y="2440.3647" + x="2471.614" + sodipodi:role="line" + id="tspan5432">(handwritten)</tspan></text> + <path + style="fill:#9d9faa;fill-opacity:1;stroke:none;stroke-width:2.18747473;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2166.5963,2394.0075 v 66.9548 h 171.1068 l 14.8788,-14.8788 v -66.9549 h -171.1068 z" + id="path3715-5-6-7-9-8-7-9" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:0%;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.58586931px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;" + x="2259.5852" + y="2412.0415" + id="text2735"><tspan + sodipodi:role="line" + x="2259.5852" + y="2412.0415" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.58586931px;" + id="tspan2737">injected code</tspan><tspan + id="tspan2743" + sodipodi:role="line" + x="2259.5852" + y="2442.0415" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:1.58586931px;">(handwritten)</tspan></text> </g> <g transform="translate(-102.30216,-279.71223)" - id="g5541"> + id="g5541" + style="stroke:none"> <path sodipodi:type="arc" - style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" id="path5535" sodipodi:cx="255.10791" sodipodi:cy="326.69064" sodipodi:rx="38.848923" sodipodi:ry="38.848923" - d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z" + d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z" transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" /> <text xml:space="preserve" - style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal" x="1946.3259" y="2435.7" id="text5537"><tspan @@ -351,24 +457,25 @@ id="tspan5539" x="1946.3259" y="2435.7" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">1</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">1</tspan></text> </g> <g transform="translate(52.589867,-352.69787)" - id="g5546"> + id="g5546" + style="stroke:none"> <path sodipodi:type="arc" - style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" id="path5548" sodipodi:cx="255.10791" sodipodi:cy="326.69064" sodipodi:rx="38.848923" sodipodi:ry="38.848923" - d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z" + d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z" transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" /> <text xml:space="preserve" - style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal" x="1946.3259" y="2435.7" id="text5550"><tspan @@ -376,134 +483,25 @@ id="tspan5552" x="1946.3259" y="2435.7" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">2</tspan></text> - </g> - <g - transform="matrix(0,-1,1,0,697.50638,3244.256)" - id="g5624"> - <g - id="g5626" - transform="matrix(0,-1,1,0,-294.81158,2953.0504)"> - <path - sodipodi:nodetypes="cc" - inkscape:connector-type="polyline" - id="path5628" - d="M 1586.5317,1348.2858 L 1586.6222,1389.8124" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" - d="M 1586.7489,1389.4756 L 1594.7468,1380.3688" - id="path5630" - inkscape:connector-type="polyline" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" - d="M 1586.6031,1389.5063 L 1578.6052,1380.3994" - id="path5632" - inkscape:connector-type="polyline" - sodipodi:nodetypes="cc" /> - </g> - </g> - <g - transform="translate(5.3442137,15.993306)" - id="g5459"> - <rect - rx="2.4652832" - ry="2.9818845" - y="2151.3206" - x="1965.7682" - height="75.127686" - width="185.53668" - id="rect3485" - style="fill:#b2e994;fill-opacity:1;stroke:#56f400;stroke-width:0.78531456;stroke-opacity:1" /> - <text - id="text3487" - y="2184.2461" - x="2059.1909" - style="font-size:27.94354057px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - xml:space="preserve"><tspan - id="tspan2509" - style="font-size:19.56047821px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - y="2184.2461" - x="2059.1909" - sodipodi:role="line">typesystem</tspan><tspan - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - y="2205.1477" - x="2059.1909" - sodipodi:role="line" - id="tspan5432">(handwritten)</tspan></text> - </g> - <g - transform="matrix(0,-1,1,0,908.50929,3242.9612)" - id="g5648"> - <g - id="g5650" - transform="matrix(0,-1,1,0,-294.81158,2953.0504)"> - <path - sodipodi:nodetypes="cc" - inkscape:connector-type="polyline" - id="path5652" - d="M 1586.5317,1348.2858 L 1586.6222,1389.8124" - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" - d="M 1586.7489,1389.4756 L 1594.7468,1380.3688" - id="path5654" - inkscape:connector-type="polyline" - sodipodi:nodetypes="cc" /> - <path - style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" - d="M 1586.6031,1389.5063 L 1578.6052,1380.3994" - id="path5656" - inkscape:connector-type="polyline" - sodipodi:nodetypes="cc" /> - </g> - </g> - <g - transform="translate(299.78191,21.148391)" - id="g2771"> - <rect - style="fill:#cce994;fill-opacity:1;stroke:#a1f400;stroke-width:0.62429351;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect2733" - width="185.69771" - height="75.288704" - x="1882.2529" - y="2146.085" - ry="2.2607138" - rx="2.0576432" /> - <text - xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="1975.134" - y="2180.2722" - id="text2735"><tspan - sodipodi:role="line" - x="1975.134" - y="2180.2722" - style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold" - id="tspan2737">injected code</tspan><tspan - id="tspan2743" - sodipodi:role="line" - x="1975.134" - y="2201.7917" - style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">(handwritten)</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">2</tspan></text> </g> <g transform="translate(200.4676,-222.96766)" - id="g5554"> + id="g5554" + style="stroke:none"> <path sodipodi:type="arc" - style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" id="path5556" sodipodi:cx="255.10791" sodipodi:cy="326.69064" sodipodi:rx="38.848923" sodipodi:ry="38.848923" - d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z" + d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z" transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" /> <text xml:space="preserve" - style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal" x="1946.3259" y="2435.7" id="text5558"><tspan @@ -511,24 +509,25 @@ id="tspan5560" x="1946.3259" y="2435.7" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">3</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">3</tspan></text> </g> <g transform="translate(413.633,-206.84535)" - id="g5562"> + id="g5562" + style="stroke:none"> <path sodipodi:type="arc" - style="fill:#f28888;fill-opacity:1;stroke:#d5f400;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" + style="fill:#f28888;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" id="path5564" sodipodi:cx="255.10791" sodipodi:cy="326.69064" sodipodi:rx="38.848923" sodipodi:ry="38.848923" - d="M 293.95683,326.69064 A 38.848923,38.848923 0 1 1 216.25899,326.69064 A 38.848923,38.848923 0 1 1 293.95683,326.69064 z" + d="m 293.95683,326.69064 a 38.848923,38.848923 0 0 1 -38.84892,38.84893 38.848923,38.848923 0 0 1 -38.84892,-38.84893 38.848923,38.848923 0 0 1 38.84892,-38.84892 38.848923,38.848923 0 0 1 38.84892,38.84892 z" transform="matrix(0.4405339,0,0,0.4405339,1842.2283,2282.9708)" /> <text xml:space="preserve" - style="font-size:27.62000275px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + style="font-style:normal;font-weight:normal;line-height:0%;font-family:Titillium;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;-inkscape-font-specification:'Titillium, Normal';font-stretch:normal;font-variant:normal;font-size:26.66666667px;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal" x="1946.3259" y="2435.7" id="text5566"><tspan @@ -536,7 +535,7 @@ id="tspan5568" x="1946.3259" y="2435.7" - style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:FreeMono;-inkscape-font-specification:FreeMono Bold">4</tspan></text> + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666667px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;stroke:none">4</tspan></text> </g> </g> </g> diff --git a/sources/shiboken2/doc/images/boostqtarch.png b/sources/shiboken2/doc/images/boostqtarch.png Binary files differdeleted file mode 100644 index f1b145e9c..000000000 --- a/sources/shiboken2/doc/images/boostqtarch.png +++ /dev/null diff --git a/sources/shiboken2/doc/images/boostqtarch.svg b/sources/shiboken2/doc/images/boostqtarch.svg deleted file mode 100644 index 9fbb38271..000000000 --- a/sources/shiboken2/doc/images/boostqtarch.svg +++ /dev/null @@ -1,226 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="350" - height="220" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.46" - version="1.0" - sodipodi:docname="boostqtarch.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="boostqtarch.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs4"> - <marker - inkscape:stockid="Arrow2Lend" - orient="auto" - refY="0" - refX="0" - id="Arrow2Lend" - style="overflow:visible"> - <path - id="path3636" - style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" - d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.97309,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z" - transform="matrix(-1.1,0,0,-1.1,-1.1,0)" /> - </marker> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="744.09448 : 526.18109 : 1" - inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - id="perspective10" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.4812981" - inkscape:cx="145.70936" - inkscape:cy="94.089827" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:window-width="1278" - inkscape:window-height="951" - inkscape:window-x="1592" - inkscape:window-y="29" - showguides="true" - inkscape:guide-bbox="true" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(-61.076804,-301.50489)"> - <flowRoot - xml:space="preserve" - id="flowRoot3229" - style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - transform="translate(2.0918751e-6,-6.0000008)"><flowRegion - id="flowRegion3231"><rect - id="rect3233" - width="125.74072" - height="40.5849" - x="388.45547" - y="279.5423" /></flowRegion><flowPara - id="flowPara3235" /></flowRoot> <g - id="g3010" - transform="matrix(0.9508755,0,0,0.9508755,11.317746,20.273572)"> - <g - transform="translate(0,-9.7919846e-6)" - id="g2952"> - <rect - style="fill:#dfe994;fill-opacity:1;stroke:#d5f400;stroke-width:0.7162478;stroke-opacity:1" - id="rect3166" - width="349.23203" - height="67.403336" - x="61.417336" - y="377.74161" - ry="2.6752985" - rx="2.285728" /> - <text - xml:space="preserve" - style="font-size:29.38717079px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="236.08904" - y="397.98755" - id="text3168"><tspan - sodipodi:role="line" - x="236.08904" - y="397.98755" - style="font-size:20.57102013px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - id="tspan3176">Boost::Python</tspan><tspan - sodipodi:role="line" - x="236.08904" - y="418.35535" - style="font-size:15.20761585px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - id="tspan2880">helper library to interface with CPython API</tspan><tspan - id="tspan2922" - sodipodi:role="line" - x="236.08904" - y="437.36487" - style="font-size:15.20761585px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#4c5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">and expose C++ entities to Python</tspan></text> - </g> - <g - transform="translate(0,-9.7025776e-6)" - id="g2959"> - <rect - style="fill:#addc52;fill-opacity:1;stroke:#6ca400;stroke-width:0.71624762;stroke-opacity:1" - id="rect3542" - width="349.23203" - height="67.403351" - x="61.417336" - y="301.84543" - ry="2.675298" - rx="2.285728" /> - <text - xml:space="preserve" - style="font-size:29.38717079px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="236.5123" - y="322.09137" - id="text3544"><tspan - id="tspan3596" - sodipodi:role="line" - x="236.5123" - y="322.09137" - style="font-size:20.57102013px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans">Qt-Python Bindings</tspan><tspan - sodipodi:role="line" - x="236.5123" - y="342.45917" - style="font-size:15.20761585px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - id="tspan12937">Qt classes and functions</tspan><tspan - sodipodi:role="line" - x="236.5123" - y="361.46869" - style="font-size:15.20761585px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#050800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - id="tspan2411">exported to Python</tspan></text> - </g> - <g - id="g2998"> - <g - id="g2986"> - <rect - rx="2.285728" - ry="2.675298" - y="453.63776" - x="61.417336" - height="67.403336" - width="172.02341" - id="rect3485" - style="fill:#b2e994;fill-opacity:1;stroke:#56f400;stroke-width:0.71624762;stroke-opacity:1" /> - <text - id="text3487" - y="482.29712" - x="147.73038" - style="font-size:29.38717079px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - xml:space="preserve"><tspan - style="font-size:20.57102013px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - y="482.29712" - x="147.73038" - sodipodi:role="line" - id="tspan3499">CPython</tspan><tspan - id="tspan2509" - style="font-size:20.57102013px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#1f5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - y="508.01089" - x="147.73038" - sodipodi:role="line">API</tspan></text> - </g> - <g - id="g2992"> - <rect - rx="2.285728" - ry="2.675298" - y="453.63776" - x="239.30101" - height="67.403351" - width="172.02295" - id="rect2459" - style="fill:#cce994;fill-opacity:1;stroke:#a1f400;stroke-width:0.71624762;stroke-opacity:1" /> - <text - id="text2461" - y="481.97067" - x="324.86047" - style="font-size:29.38717079px;font-style:normal;font-weight:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - xml:space="preserve"><tspan - style="font-size:20.57102013px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - y="481.97067" - x="324.86047" - sodipodi:role="line" - id="tspan2467">Qt4</tspan><tspan - id="tspan2490" - style="font-size:20.57102013px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;text-anchor:middle;fill:#3a5800;fill-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - y="507.68445" - x="324.86047" - sodipodi:role="line">Libraries</tspan></text> - </g> - </g> - </g> - </g> -</svg> diff --git a/sources/shiboken2/doc/images/converter.dot b/sources/shiboken2/doc/images/converter.dot deleted file mode 100644 index 412341df9..000000000 --- a/sources/shiboken2/doc/images/converter.dot +++ /dev/null @@ -1,14 +0,0 @@ -digraph Conversions { - rankdir=LR - CppType1 [ label="C++\nType" ] - Converter1 [ label="Converter\nPython -> C++", shape=hexagon ] - PythonType1 -> Converter1 - PythonType2 -> Converter1 - PythonType3 -> Converter1 - Converter1 -> CppType1 - - CppType2 [ label="C++\nType" ] - PythonType4 [ label="PythonType" ] - Converter2 [ label="Converter\nPython -> C++", shape=hexagon ] - CppType2 -> Converter2 -> PythonType4 -}
\ No newline at end of file diff --git a/sources/shiboken2/doc/images/converter.png b/sources/shiboken2/doc/images/converter.png Binary files differindex 51cd2af71..cd52e2769 100644 --- a/sources/shiboken2/doc/images/converter.png +++ b/sources/shiboken2/doc/images/converter.png diff --git a/sources/shiboken2/doc/images/converter.svg b/sources/shiboken2/doc/images/converter.svg new file mode 100644 index 000000000..4305eb720 --- /dev/null +++ b/sources/shiboken2/doc/images/converter.svg @@ -0,0 +1,349 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="206.375mm" + height="100.54167mm" + viewBox="0 0 206.375 100.54167" + version="1.1" + id="svg8" + inkscape:version="0.92.2 2405546, 2018-03-11" + sodipodi:docname="converter.svg"> + <defs + id="defs2"> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker1623" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend"> + <path + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path1621" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker1569" + style="overflow:visible" + inkscape:isstock="true" + inkscape:collect="always"> + <path + id="path1567" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker1521" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend" + inkscape:collect="always"> + <path + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path1519" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="marker1479" + style="overflow:visible" + inkscape:isstock="true" + inkscape:collect="always"> + <path + id="path1477" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:isstock="true" + style="overflow:visible" + id="marker1443" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Lend" + inkscape:collect="always"> + <path + transform="matrix(-0.8,0,0,-0.8,-10,0)" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + id="path1441" + inkscape:connector-curvature="0" /> + </marker> + <marker + inkscape:stockid="Arrow1Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow1Lend" + style="overflow:visible" + inkscape:isstock="true" + inkscape:collect="always"> + <path + id="path1154" + d="M 0,0 5,-5 -12.5,0 5,5 Z" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1" + transform="matrix(-0.8,0,0,-0.8,-10,0)" + inkscape:connector-curvature="0" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.35" + inkscape:cx="382.16184" + inkscape:cy="-28.417621" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-width="1002" + inkscape:window-height="1042" + inkscape:window-x="10" + inkscape:window-y="28" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid971" + originx="-58.208333" + originy="-68.791657" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-58.208333,-127.66667)"> + <path + style="fill:#17a81a;fill-opacity:1;stroke:none;stroke-width:0.82824755;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 127,132.95834 0.0687,26.45833 h 63.43127 l 5.29167,-5.29167 v -26.45833 h -63.5 z" + id="path3715-5-6-7-9-8-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:#3a4055;fill-opacity:1;stroke:none;stroke-width:0.67261654;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 68.791667,132.95834 v 26.45833 H 105.83333 L 111.125,154.125 V 127.66667 H 74.083333 Z" + id="path3715-5-6-7-9-8-7-6-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:#848895;fill-opacity:1;stroke:none;stroke-width:0.52087492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 58.208333,173.96875 V 185.875 h 48.947917 l 3.96875,-3.96875 V 170 H 62.177083 Z" + id="path3715-5-6-7-9-8-7-6-56" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:#17a81a;fill-opacity:1;stroke:none;stroke-width:0.82824755;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 127.00003,175.29167 0.0687,26.45833 H 190.5 l 5.29167,-5.29167 V 170 h -63.5 z" + id="path3715-5-6-7-9-8-7-2" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:#848895;fill-opacity:1;stroke:none;stroke-width:0.52087492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 58.208333,195.13542 v 11.90625 h 48.947917 l 3.96875,-3.96875 V 191.16667 H 62.177083 Z" + id="path3715-5-6-7-9-8-7-6-56-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:#848895;fill-opacity:1;stroke:none;stroke-width:0.52087492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 58.208343,216.30209 v 11.90625 h 48.947907 l 3.96875,-3.96875 V 212.33334 H 62.177093 Z" + id="path3715-5-6-7-9-8-7-6-56-0" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="65.68634" + y="179.68727" + id="text1032"><tspan + sodipodi:role="line" + id="tspan1030" + x="65.68634" + y="179.68727" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">PythonType1</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="65.326508" + y="200.85394" + id="text1032-1"><tspan + sodipodi:role="line" + id="tspan1030-1" + x="65.326508" + y="200.85394" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">PythonType2</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="65.319458" + y="222.02061" + id="text1032-4"><tspan + sodipodi:role="line" + id="tspan1030-6" + x="65.319458" + y="222.02061" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">PythonType3</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:Titillium;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="90.120621" + y="139.29776" + id="text1062"><tspan + sodipodi:role="line" + id="tspan1060" + x="90.120621" + y="139.29776" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87777805px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">C++</tspan><tspan + sodipodi:role="line" + x="90.120621" + y="152.52693" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87777805px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332" + id="tspan1064">Type</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:Titillium;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="135.41069" + y="138.95909" + id="text1068"><tspan + sodipodi:role="line" + id="tspan1066" + x="135.41069" + y="138.95909" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">Converter</tspan><tspan + sodipodi:role="line" + x="135.41069" + y="152.18826" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332" + id="tspan1070">C++ -> Python</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:Titillium;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="135.41072" + y="181.29242" + id="text1068-9"><tspan + sodipodi:role="line" + id="tspan1066-7" + x="135.41072" + y="181.29242" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">Converter</tspan><tspan + sodipodi:role="line" + x="135.41072" + y="194.52159" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332" + id="tspan1070-5">Python -> C++</tspan></text> + <path + style="fill:#3a4055;fill-opacity:1;stroke:none;stroke-width:0.67261654;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 211.66667,175.29167 V 201.75 h 37.04166 L 254,196.45833 V 170 h -37.04167 z" + id="path3715-5-6-7-9-8-7-6-3-9" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.58333302px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:Titillium;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="232.99562" + y="181.63109" + id="text1062-7"><tspan + sodipodi:role="line" + id="tspan1060-4" + x="232.99562" + y="181.63109" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87777805px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">C++</tspan><tspan + sodipodi:role="line" + x="232.99562" + y="194.86026" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.87777805px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332" + id="tspan1064-9">Type</tspan></text> + <path + style="fill:#848895;fill-opacity:1;stroke:none;stroke-width:0.52087492;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 211.66667,131.63542 v 11.90625 h 48.94791 l 3.96875,-3.96875 v -11.90625 h -48.94791 z" + id="path3715-5-6-7-9-8-7-6-56-0-1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" + x="220.67876" + y="137.35394" + id="text1032-4-7"><tspan + sodipodi:role="line" + id="tspan1030-6-0" + x="220.67876" + y="137.35394" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;font-family:Titillium;-inkscape-font-specification:'Titillium, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.26458332">PythonType</tspan></text> + <path + style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow1Lend)" + d="M 111.125,143.54167 H 127" + id="path1149" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker1443)" + d="M 111.125,175.29167 H 127" + id="path1433" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker1479)" + d="M 111.125,196.45834 127,185.875" + id="path1469" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker1521)" + d="M 111.125,217.625 127,201.75" + id="path1511" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker1569)" + d="m 195.79166,185.875 h 15.875" + id="path1559" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker1623)" + d="m 195.79166,138.25001 h 15.875" + id="path1613" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/sources/shiboken2/doc/images/shibokenqtarch.png b/sources/shiboken2/doc/images/shibokenqtarch.png Binary files differnew file mode 100644 index 000000000..359413373 --- /dev/null +++ b/sources/shiboken2/doc/images/shibokenqtarch.png diff --git a/sources/shiboken2/doc/images/shibokenqtarch.svg b/sources/shiboken2/doc/images/shibokenqtarch.svg new file mode 100644 index 000000000..d9212f18c --- /dev/null +++ b/sources/shiboken2/doc/images/shibokenqtarch.svg @@ -0,0 +1,188 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="275" + height="197.55103" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.92.2 2405546, 2018-03-11" + version="1.0" + sodipodi:docname="shibokenqtarch.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="shibokenqtarch.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4"> + <marker + inkscape:stockid="Arrow2Lend" + orient="auto" + refY="0" + refX="0" + id="Arrow2Lend" + style="overflow:visible"> + <path + id="path3636" + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="matrix(-1.1,0,0,-1.1,-1.1,0)" + inkscape:connector-curvature="0" /> + </marker> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective10" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.0474359" + inkscape:cx="110.19617" + inkscape:cy="69.09871" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1002" + inkscape:window-height="1042" + inkscape:window-x="10" + inkscape:window-y="28" + showguides="true" + inkscape:guide-bbox="true" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid44" + originx="-44.999996" + originy="-12.44898" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-106.0768,-311.50489)"> + <path + style="fill:#21be2b;fill-opacity:1;stroke:none;stroke-width:2.20567369;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 106.0768,322.72938 v 44.89796 h 262.2093 l 12.7907,-11.22449 V 311.50489 H 117.53514 Z" + id="path3715-5-6-7-9-8-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:#17a81a;fill-opacity:1;stroke:none;stroke-width:1.57079244;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 251.99517,457.61034 v 51.44557 H 369.85231 L 381.0768,498.76679 V 447.32122 H 263.21966 Z" + id="path3715-5-6-7-9-6-7" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <path + style="fill:#53586b;fill-opacity:1;stroke:none;stroke-width:1.57079256;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 106.0768,457.61034 v 51.44557 h 117.85714 l 11.22449,-10.28912 V 447.32122 H 117.30129 Z" + id="path3715-5-6-7-9-6-7-5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:16.68707466px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.12244904;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + x="120.87232" + y="334.88406" + id="text153"><tspan + sodipodi:role="line" + id="tspan151" + x="120.87232" + y="334.88406" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:16.68707466px;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.12244904;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">Qt for Python</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.74510956px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:Titillium;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.31862774" + x="121.09701" + y="354.01886" + id="text157"><tspan + sodipodi:role="line" + x="121.09701" + y="354.01886" + id="tspan159" + style="fill:#ffffff;fill-opacity:1;stroke-width:0.31862774">Qt classes and functions exported to Python</tspan></text> + <path + style="fill:#53586b;fill-opacity:1;stroke:none;stroke-width:2.20567369;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 106.0768,391.19877 v 44.89796 h 262.2093 l 12.7907,-11.22449 V 379.97428 H 117.53514 Z" + id="path3715-5-6-7-9-8-7-6" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:16.68707466px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.41717955" + x="121.0225" + y="403.38095" + id="text153-2"><tspan + sodipodi:role="line" + id="tspan151-9" + x="121.0225" + y="403.38095" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:16.68707466px;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.41717955">Shiboken</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.74510956px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:Titillium;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.31862774" + x="121.09701" + y="421.95245" + id="text157-1"><tspan + sodipodi:role="line" + x="121.09701" + y="421.95245" + id="tspan159-2" + style="fill:#ffffff;fill-opacity:1;stroke-width:0.31862774">Generator that exposes C++ classes to Python</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:17.95918465px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.31862774" + x="123.35368" + y="482.61551" + id="text157-1-7"><tspan + sodipodi:role="line" + x="123.35368" + y="482.61551" + id="tspan159-2-0" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:17.95918465px;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.31862774">CPython API</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:17.95918465px;line-height:1.25;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.4132798" + x="265.1445" + y="483.19019" + id="text157-1-9"><tspan + sodipodi:role="line" + x="265.1445" + y="483.19019" + id="tspan159-2-3" + style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:17.95918465px;font-family:Titillium;-inkscape-font-specification:'Titillium, Semi-Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke-width:0.4132798">Qt 5 Libraries</tspan></text> + </g> +</svg> diff --git a/sources/shiboken2/doc/overview.rst b/sources/shiboken2/doc/overview.rst index 5f50610ff..97ef2c13c 100644 --- a/sources/shiboken2/doc/overview.rst +++ b/sources/shiboken2/doc/overview.rst @@ -23,13 +23,13 @@ Each module of the generator system has an specific role. 3. Modify the API to expose the objects in a way that fits you target language best. 4. Insert customizations where handwritten code is needed. -.. figure:: images/boostqtarch.png +.. figure:: images/shibokenqtarch.png :scale: 80 :align: center Runtime architecture -The newly created binding will run on top of Boost.Python library which takes +The newly created binding will run on top of Shiboken which takes care of interfacing Python and the underlying C++ library. Handwritten inputs diff --git a/sources/shiboken2/doc/ownership.rst b/sources/shiboken2/doc/ownership.rst index 69791f855..f3744a537 100644 --- a/sources/shiboken2/doc/ownership.rst +++ b/sources/shiboken2/doc/ownership.rst @@ -35,7 +35,7 @@ Invalidating objects ==================== To prevent segfaults and double frees, the wrapper objects are invalidated. -An invalidated can't be passed as argument or have an attributte or method accessed. +An invalidated can't be passed as argument or have an attribute or method accessed. Trying to do this will raise RuntimeError. The following situations can invalidate an object: @@ -48,7 +48,7 @@ C++ taking ownership :ref:`virtual destructor <ownership-virt-method>` or the transfer is due to the special case of :ref:`parent ownership <ownership-parent>`. - Besides being passed as argument, the callee object can have its ownership changed, like + Besides being passed as argument, the called object can have its ownership changed, like the `setParent` method in Qt's `QObject`. Invalidate after use @@ -69,7 +69,7 @@ Objects with virtual methods any derived class in Python also override it. If the class has a virtual destructor (and C++ classes with virtual methods should have), this - C++ instance invalidates the wrapper only when the overriden destructor is called. + C++ instance invalidates the wrapper only when the overridden destructor is called. One exception to this rule is when the object is created in C++, like in a factory method. This way the wrapped object is a C++ instance of the native @@ -128,7 +128,7 @@ Not saving unowned objects references ------------------------------------- Sometimes when you pass an instance as argument to a method and the receiving - instance will need that object to live indifinitely, but will not take ownership + instance will need that object to live indefinitely, but will not take ownership of the argument instance. In this case, you should hold a reference to the argument instance. diff --git a/sources/shiboken2/doc/projectfile.rst b/sources/shiboken2/doc/projectfile.rst index 6c9808da4..aa703d941 100644 --- a/sources/shiboken2/doc/projectfile.rst +++ b/sources/shiboken2/doc/projectfile.rst @@ -4,9 +4,9 @@ Binding Project File ******************** -Instead of directing the Generator behaviour via command line, the binding developer -can write a text project file describing the same information, and avoid the hassle -of a long stream of command line arguments. +Instead of directing the Generator behavior via command line, the binding +developer can write a text project file describing the same information, and +avoid the hassle of a long stream of command line arguments. .. _project-file-structure: @@ -34,11 +34,13 @@ Project file tags The generator project file tags are in direct relation to the :ref:`command line arguments <command-line>`. All of the current command line -options provided by |project| were already seen on the :ref:`project-file-structure`, -for new command line options provided by additional generator modules (e.g.: qtdoc, -Shiboken) could also be used in the generator project file following simple conversion rules. +options provided by |project| were already seen on the +:ref:`project-file-structure`, for new command line options provided by +additional generator modules (e.g.: qtdoc, Shiboken) could also be used in the +generator project file following simple conversion rules. -For tags without options, just write as an empty tag without any attributes. Example: +For tags without options, just write as an empty tag without any attributes. +Example: .. code-block:: bash diff --git a/sources/shiboken2/doc/sequenceprotocol.rst b/sources/shiboken2/doc/sequenceprotocol.rst index 587c0f95b..26ae3b220 100644 --- a/sources/shiboken2/doc/sequenceprotocol.rst +++ b/sources/shiboken2/doc/sequenceprotocol.rst @@ -1,7 +1,8 @@ Sequence Protocol ----------------- -Support for the sequence protocol is achieved adding functions with special names, this is done using the add-function tag. +Support for the sequence protocol is achieved adding functions with special +names, this is done using the add-function tag. The special function names are: @@ -15,9 +16,14 @@ The special function names are: __concat__ PyObject* self, PyObject* _other PyObject* PySequence_Concat ============= =============================================== ==================== =================== -You just need to inform the function name to the add-function tag, without any parameter or return type information, when you do it, |project| will create a C function with parameters and return type definied by the table above. +You just need to inform the function name to the add-function tag, without any +parameter or return type information, when you do it, |project| will create a C +function with parameters and return type defined by the table above. -The function needs to follow the same semantics of the *CPython equivalent* function, the only way to do it is using the :doc:`inject-code <codeinjectionsemantics>` tag. - -A concrete exemple how to add sequence protocol support to a class can be found on shiboken tests, more precisely in the definition of the Str class in ``tests/samplebinding/typesystem_sample.xml``. +The function needs to follow the same semantics of the *CPython equivalent* +function, the only way to do it is using the +:doc:`inject-code <codeinjectionsemantics>` tag. +A concrete example how to add sequence protocol support to a class can be found +on shiboken tests, more precisely in the definition of the Str class in +``tests/samplebinding/typesystem_sample.xml``. diff --git a/sources/shiboken2/doc/typeconverters.rst b/sources/shiboken2/doc/typeconverters.rst index 3779b26d7..ea32c7f0c 100644 --- a/sources/shiboken2/doc/typeconverters.rst +++ b/sources/shiboken2/doc/typeconverters.rst @@ -2,7 +2,13 @@ User Defined Type Conversion **************************** -In the process of creating Python bindings of a C++ library, most of the C++ classes will have wrappers representing them in Python land. But there may be other classes that are very simple and/or have a Python type as a direct counter part. (Example: a "Complex" class, that represents complex numbers, has a Python equivalent in the "complex" type.) Such classes, instead of getting a Python wrapper, normally have conversions rules, from Python to C++ and vice-versa. +In the process of creating Python bindings of a C++ library, most of the C++ +classes will have wrappers representing them in Python land. +But there may be other classes that are very simple and/or have a Python type +as a direct counter part. (Example: a "Complex" class, that represents complex +numbers, has a Python equivalent in the "complex" type.) Such classes, instead +of getting a Python wrapper, normally have conversions rules, from Python to +C++ and vice-versa. .. code-block:: c++ @@ -22,7 +28,8 @@ In the process of creating Python bindings of a C++ library, most of the C++ cla Complex cpx(real, imag); -For the user defined conversion code to be inserted in the proper places, the "<conversion-rule>" tag must be used. +For the user defined conversion code to be inserted in the proper places, +the "<conversion-rule>" tag must be used. .. code-block:: xml @@ -51,25 +58,23 @@ For the user defined conversion code to be inserted in the proper places, the "< The details will be given later, but the gist of it are the tags -`<native-to-target> <http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#native-to-target>`_, -which has only one conversion from C++ to Python, and -`<target-to-native> <http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#target-to-native>`_, -that may define the conversion of multiple Python types to C++'s "Complex" type. +`<native-to-target>`_, which has only one conversion from C++ to Python, and +`<target-to-native>`_, that may define the conversion of multiple Python types +to C++'s "Complex" type. .. image:: images/converter.png :height: 240px :align: center -|project| expects the code for `<native-to-target> <http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#native-to-target>`_, -to directly return the Python result of the conversion, and the added conversions inside the -`<target-to-native> <http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#target-to-native>`_ -must attribute the Python to C++ conversion result to the :ref:`%out <out>` variable. +|project| expects the code for `<native-to-target>`_, to directly return the +Python result of the conversion, and the added conversions inside the +`<target-to-native>`_ must attribute the Python to C++ conversion result to +the :ref:`%out <out>` variable. - -Expanding on the last example, if the binding developer want a Python 2-tuple of numbers to be accepted -by wrapped C++ functions with "Complex" arguments, an -`<add-conversion> <http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#add-conversion>`_ -tag and a custom check must be added. Here's how to do it: +Expanding on the last example, if the binding developer want a Python 2-tuple +of numbers to be accepted by wrapped C++ functions with "Complex" arguments, +an `<add-conversion>`_ tag and a custom check must be added. +Here's how to do it: .. code-block:: xml @@ -120,18 +125,18 @@ tag and a custom check must be added. Here's how to do it: </primitive-type> - .. _container_conversions: Container Conversions ===================== -Converters for -`<container-type> <http://www.pyside.org/docs/apiextractor/typesystem_specifying_types.html#container-type>`_ -are pretty much the same as for other type, except that they make use of the type system variables -:ref:`%INTYPE_# <intype_n>` and :ref:`%OUTTYPE_# <outtype_n>`. |project| combines the conversion code for -containers with the conversion defined (or automatically generated) for the containees. +Converters for `<container-type>`_ are pretty much the same as for other type, +except that they make use of the type system variables +:ref:`%INTYPE_# <intype_n>` and :ref:`%OUTTYPE_# <outtype_n>`. +|project| combines the conversion code for containers with the conversion +defined (or automatically generated) for the containers. +.. _`container-type`: http://www.pyside.org/docs/apiextractor/typesystem_specifying_types.html#container-type .. code-block:: xml @@ -279,10 +284,14 @@ And implemented in a separate C++ file, like this: } -In this case, the parts of the implementation that will be used in the new conversion-rule -are the ones in the two last method ``static inline PyObject* toPython(const Complex& cpx)`` -and ``static inline Complex toCpp(PyObject* pyobj)``. The ``isConvertible`` method is gone, -and the ``checkType`` is now an attribute of the -`<add-conversion> <http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#add-conversion>`_ -tag. Refer back to the first example in this page and you will be able to correlate the above template -with the new scheme of conversion rule definition. +In this case, the parts of the implementation that will be used in the new +conversion-rule are the ones in the two last method +``static inline PyObject* toPython(const Complex& cpx)`` and +``static inline Complex toCpp(PyObject* pyobj)``. The ``isConvertible`` method +is gone, and the ``checkType`` is now an attribute of the `<add-conversion>`_ +tag. Refer back to the first example in this page and you will be able to +correlate the above template with the new scheme of conversion rule definition. + +.. _`<native-to-target>`: http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#native-to-target +.. _`<target-to-native>`: http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#target-to-native +.. _`<add-conversion>`: http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#add-conversion diff --git a/sources/shiboken2/doc/typesystemvariables.rst b/sources/shiboken2/doc/typesystemvariables.rst index 205430550..9de2b02f5 100644 --- a/sources/shiboken2/doc/typesystemvariables.rst +++ b/sources/shiboken2/doc/typesystemvariables.rst @@ -59,9 +59,8 @@ Variables system), this value will be inserted in the argument list. If you want to remove the argument so completely that it doesn't appear in any form on the ``%ARGUMENT_NAMES`` replacement, don't forget to remove also its default value - with the `<remove-default-expression/> - <http://www.pyside.org/docs/apiextractor/typesystem_arguments.html#remove-default-expression>`_ - type system tag. + with the `<remove-default-expression/>`_ type system tag. + Take the following method and related type system description as an example: @@ -334,3 +333,5 @@ that expects a Python sequence instead. </inject-code> </modify-function> + +.. _`<remove-default-expression/>`: http://www.pyside.org/docs/apiextractor/typesystem_arguments.html#remove-default-expression diff --git a/sources/shiboken2/doc/wordsofadvice.rst b/sources/shiboken2/doc/wordsofadvice.rst index b66799338..9aebf1f03 100644 --- a/sources/shiboken2/doc/wordsofadvice.rst +++ b/sources/shiboken2/doc/wordsofadvice.rst @@ -75,7 +75,8 @@ C++ object. In summary: don't do it! Python old style classes and PySide =================================== -Because of some architectural decisions and deprecated Python types. Since PySide 1.1 old style classes are not supported with multiple inheritance. +Because of some architectural decisions and deprecated Python types. +Since PySide 1.1 old style classes are not supported with multiple inheritance. Below you can check the examples: @@ -92,7 +93,8 @@ Example with old style class: pass -this example will raise a 'TypeError' due to the limitation on PySide, to fix this you will need use the new style class: +this example will raise a 'TypeError' due to the limitation on PySide, to fix +this you will need use the new style class: .. code-block:: python @@ -106,4 +108,5 @@ this example will raise a 'TypeError' due to the limitation on PySide, to fix th pass -All classes used for multiple inheritance with other PySide types need to have 'object' as base class. +All classes used for multiple inheritance with other PySide types need to have +'object' as base class. diff --git a/sources/shiboken2/generator/main.cpp b/sources/shiboken2/generator/main.cpp index 774775fb0..b787d9f7e 100644 --- a/sources/shiboken2/generator/main.cpp +++ b/sources/shiboken2/generator/main.cpp @@ -146,13 +146,18 @@ static void printOptions(QTextStream& s, const OptionDescriptions& options) { s.setFieldAlignment(QTextStream::AlignLeft); for (const auto &od : options) { - s << ' '; if (!od.first.startsWith(QLatin1Char('-'))) s << "--"; - s.setFieldWidth(38); - s << od.first << od.second; - s.setFieldWidth(0); - s << endl; + s << od.first; + if (od.second.isEmpty()) { + s << ", "; + } else { + s << endl; + const auto lines = od.second.splitRef(QLatin1Char('\n')); + for (const auto &line : lines) + s << " " << line << endl; + s << endl; + } } } @@ -348,7 +353,8 @@ void printUsage() << qMakePair(QLatin1String("documentation-only"), QLatin1String("Do not generates any code, just the documentation")) << qMakePair(QLatin1String("drop-type-entries=\"<TypeEntry0>[;TypeEntry1;...]\""), - QLatin1String("Semicolon separated list of type system entries (classes, namespaces, global functions and enums) to be dropped from generation.")) + QLatin1String("Semicolon separated list of type system entries (classes, namespaces,\n" + "global functions and enums) to be dropped from generation.")) << qMakePair(QLatin1String("-F") + pathSyntax, QString()) << qMakePair(QLatin1String("framework-include-paths=") + pathSyntax, QLatin1String("Framework include paths used by the C++ parser")) @@ -367,7 +373,8 @@ void printUsage() << qMakePair(QLatin1String("output-directory=<path>"), QLatin1String("The directory where the generated files will be written")) << qMakePair(QLatin1String("project-file=<file>"), - QLatin1String("text file containing a description of the binding project. Replaces and overrides command line arguments")) + QLatin1String("text file containing a description of the binding project.\n" + "Replaces and overrides command line arguments")) << qMakePair(QLatin1String("silent"), QLatin1String("Avoid printing any message")) << qMakePair(QLatin1String("-T") + pathSyntax, QString()) @@ -381,7 +388,7 @@ void printUsage() for (const GeneratorPtr &generator : generators) { const OptionDescriptions options = generator->options(); if (!options.isEmpty()) { - s << endl << generator->name() << " options:\n"; + s << endl << generator->name() << " options:\n\n"; printOptions(s, generator->options()); } } diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp index 842c68b90..114ba401d 100644 --- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp +++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp @@ -772,14 +772,25 @@ void QtXmlToSphinx::handleRowTag(QXmlStreamReader& reader) } } +enum ListType { BulletList, OrderedList, EnumeratedList }; + +static inline ListType webXmlListType(const QStringRef &t) +{ + if (t == QLatin1String("enum")) + return EnumeratedList; + if (t == QLatin1String("ordered")) + return OrderedList; + return BulletList; +} + void QtXmlToSphinx::handleListTag(QXmlStreamReader& reader) { // BUG We do not support a list inside a table cell - static QString listType; + static ListType listType = BulletList; QXmlStreamReader::TokenType token = reader.tokenType(); if (token == QXmlStreamReader::StartElement) { - listType = reader.attributes().value(QLatin1String("type")).toString(); - if (listType == QLatin1String("enum")) { + listType = webXmlListType(reader.attributes().value(QLatin1String("type"))); + if (listType == EnumeratedList) { m_currentTable << (TableRow() << "Constant" << "Description"); m_tableHasHeader = true; } @@ -787,19 +798,26 @@ void QtXmlToSphinx::handleListTag(QXmlStreamReader& reader) } else if (token == QXmlStreamReader::EndElement) { INDENT.indent++; if (!m_currentTable.isEmpty()) { - if (listType == QLatin1String("bullet")) { + switch (listType) { + case BulletList: + case OrderedList: { m_output << endl; + const char *separator = listType == BulletList ? "* " : "#. "; + const char *indent = listType == BulletList ? " " : " "; for (const TableCell &cell : m_currentTable.constFirst()) { const QVector<QStringRef> itemLines = cell.data.splitRef(QLatin1Char('\n')); - m_output << INDENT << "* " << itemLines.constFirst() << endl; + m_output << INDENT << separator << itemLines.constFirst() << endl; for (int i = 1, max = itemLines.count(); i < max; ++i) - m_output << INDENT << " " << itemLines[i] << endl; + m_output << INDENT << indent << itemLines[i] << endl; } m_output << endl; - } else if (listType == QLatin1String("enum")) { + } + break; + case EnumeratedList: m_currentTable.enableHeader(m_tableHasHeader); m_currentTable.normalize(); m_output << ensureEndl << m_currentTable; + break; } } m_currentTable.clear(); @@ -1289,6 +1307,12 @@ QString QtDocGenerator::fileNameSuffix() const return QLatin1String(".rst"); } +bool QtDocGenerator::shouldGenerate(const AbstractMetaClass *cls) const +{ + return Generator::shouldGenerate(cls) + && cls->typeEntry()->type() != TypeEntry::SmartPointerType; +} + QString QtDocGenerator::fileNameForContext(GeneratorContext &context) const { const AbstractMetaClass *metaClass = context.metaClass(); @@ -1996,11 +2020,12 @@ Generator::OptionDescriptions QtDocGenerator::options() const { return OptionDescriptions() << qMakePair(QLatin1String("doc-parser"), - QLatin1String("The documentation parser used to interpret the documentation input files (qdoc3|doxygen)")) + QLatin1String("The documentation parser used to interpret the documentation\n" + "input files (qdoc|doxygen)")) << qMakePair(QLatin1String("documentation-code-snippets-dir"), QLatin1String("Directory used to search code snippets used by the documentation")) << qMakePair(QLatin1String("documentation-data-dir"), - QLatin1String("Directory with XML files generated by documentation tool (qdoc3 or Doxygen)")) + QLatin1String("Directory with XML files generated by documentation tool")) << qMakePair(QLatin1String("documentation-extra-sections-dir"), QLatin1String("Directory used to search for extra documentation sections")) << qMakePair(QLatin1String("library-source-dir"), diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h b/sources/shiboken2/generator/qtdoc/qtdocgenerator.h index 9f08a4e8d..c8318b862 100644 --- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.h +++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.h @@ -224,6 +224,8 @@ public: return m_codeSnippetDirs; } + bool shouldGenerate(const AbstractMetaClass *) const override; + protected: QString fileNameSuffix() const override; QString fileNameForContext(GeneratorContext &context) const override; diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 18670eae6..8d4c146c1 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -4529,11 +4529,11 @@ void CppGenerator::writeEnumInitialization(QTextStream& s, const AbstractMetaEnu enumValueText += cppEnum->name() + QLatin1String("::"); enumValueText += enumValue->name(); } else { - enumValueText += QString::number(enumValue->value()); + enumValueText += enumValue->value().toString(); } - switch (enumTypeEntry->enumKind()) { - case EnumTypeEntry::AnonymousEnum: + switch (cppEnum->enumKind()) { + case AnonymousEnum: if (enclosingClass || hasUpperEnclosingClass) { s << INDENT << '{' << endl; { @@ -4557,7 +4557,7 @@ void CppGenerator::writeEnumInitialization(QTextStream& s, const AbstractMetaEnu } } break; - case EnumTypeEntry::CEnum: { + case CEnum: { s << INDENT << "if (!Shiboken::Enum::"; s << ((enclosingClass || hasUpperEnclosingClass) ? "createScopedEnumItem" : "createGlobalEnumItem"); s << '(' << enumVarTypeObj << ',' << endl; @@ -4567,7 +4567,7 @@ void CppGenerator::writeEnumInitialization(QTextStream& s, const AbstractMetaEnu s << INDENT << "return " << m_currentErrorCode << ';' << endl; } break; - case EnumTypeEntry::EnumClass: { + case EnumClass: { s << INDENT << "if (!Shiboken::Enum::createScopedEnumItem(" << enumVarTypeObj << ',' << endl; Indentation indent(INDENT); diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index d64719bb8..c3bb4cbc8 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -2240,7 +2240,13 @@ AbstractMetaClassList ShibokenGenerator::getBaseClasses(const AbstractMetaClass* { AbstractMetaClassList baseClasses; if (metaClass) { - const QStringList &baseClassNames = metaClass->baseClassNames(); + QStringList baseClassNames(metaClass->baseClassNames()); + const QString defaultSuperclass = metaClass->typeEntry()->defaultSuperclass(); + if (!defaultSuperclass.isEmpty()) { + int index = baseClassNames.indexOf(defaultSuperclass); + if (index >= 0) + baseClassNames.move(index, 0); + } for (const QString &parent : baseClassNames) { AbstractMetaClass *clazz = AbstractMetaClass::findClass(classes(), parent); if (clazz) @@ -2513,15 +2519,19 @@ Generator::OptionDescriptions ShibokenGenerator::options() const << qMakePair(QLatin1String(AVOID_PROTECTED_HACK), QLatin1String("Avoid the use of the '#define protected public' hack.")) << qMakePair(QLatin1String(DISABLE_VERBOSE_ERROR_MESSAGES), - QLatin1String("Disable verbose error messages. Turn the python code hard to debug but safe few kB on the generated bindings.")) + QLatin1String("Disable verbose error messages. Turn the python code hard to debug\n" + "but safe few kB on the generated bindings.")) << qMakePair(QLatin1String(PARENT_CTOR_HEURISTIC), QLatin1String("Enable heuristics to detect parent relationship on constructors.")) << qMakePair(QLatin1String(ENABLE_PYSIDE_EXTENSIONS), - QLatin1String("Enable PySide extensions, such as support for signal/slots, use this if you are creating a binding for a Qt-based library.")) + QLatin1String("Enable PySide extensions, such as support for signal/slots,\n" + "use this if you are creating a binding for a Qt-based library.")) << qMakePair(QLatin1String(RETURN_VALUE_HEURISTIC), - QLatin1String("Enable heuristics to detect parent relationship on return values (USE WITH CAUTION!)")) + QLatin1String("Enable heuristics to detect parent relationship on return values\n" + "(USE WITH CAUTION!)")) << qMakePair(QLatin1String(USE_ISNULL_AS_NB_NONZERO), - QLatin1String("If a class have an isNull()const method, it will be used to compute the value of boolean casts")); + QLatin1String("If a class have an isNull() const method, it will be used to compute\n" + "the value of boolean casts")); } static void getCode(QStringList& code, const CodeSnipList& codeSnips) diff --git a/sources/shiboken2/libshiboken/qapp_macro.cpp b/sources/shiboken2/libshiboken/qapp_macro.cpp index 9b940aaaa..e3f23de4f 100644 --- a/sources/shiboken2/libshiboken/qapp_macro.cpp +++ b/sources/shiboken2/libshiboken/qapp_macro.cpp @@ -105,7 +105,14 @@ reset_qApp_var() return 0; } - +/* + * Note: + * The PYSIDE-585 problem was that shutdown is called one more often + * than Q*Application is created. We could special-case that last + * shutdown or add a refcount, initially, but actually it was easier + * and more intuitive in that context to make the refcount of + * qApp_content equal to the refcount of Py_None. + */ PyObject * MakeSingletonQAppWrapper(PyTypeObject *type) { @@ -132,15 +139,16 @@ MakeSingletonQAppWrapper(PyTypeObject *type) // Debug mode showed that we need to do more than just remove the // reference. To keep everything in the right order, it is easiest // to do a full shutdown, using QtCore.__moduleShutdown(). + // restore the "None-state" PyObject *__moduleShutdown = PyDict_GetItemString(qApp_moduledicts[1], "__moduleShutdown"); - if (__moduleShutdown != NULL) { - Py_DECREF(PyObject_CallFunction(__moduleShutdown, (char *)"()")); - } - // restore the "None-state" + // PYSIDE-585: It was crucial to update the refcounts *before* + // calling the shutdown. Py_TYPE(qApp_content) = Py_NONE_TYPE; Py_REFCNT(qApp_var) = qApp_var_ref; - Py_REFCNT(qApp_content) = qApp_content_ref; + Py_REFCNT(qApp_content) = Py_REFCNT(Py_None); + if (__moduleShutdown != NULL) + Py_DECREF(PyObject_CallFunction(__moduleShutdown, (char *)"()")); } else (void)PyObject_INIT(qApp_content, type); @@ -160,7 +168,7 @@ setup_qApp_var(PyObject *module) return -1; // This is a borrowed reference qApp_moduledicts[0] = PyEval_GetBuiltins(); - Py_INCREF(qApp_content); + Py_INCREF(qApp_moduledicts[0]); init_done = 1; } @@ -170,7 +178,7 @@ setup_qApp_var(PyObject *module) if (module_index) { // This line gets a borrowed reference qApp_moduledicts[module_index] = PyModule_GetDict(module); - Py_INCREF(qApp_content); + Py_INCREF(qApp_moduledicts[module_index]); if (reset_qApp_var() < 0) return -1; } diff --git a/sources/shiboken2/libshiboken/sbkconverter.cpp b/sources/shiboken2/libshiboken/sbkconverter.cpp index 0e154da39..c81a1612b 100644 --- a/sources/shiboken2/libshiboken/sbkconverter.cpp +++ b/sources/shiboken2/libshiboken/sbkconverter.cpp @@ -523,7 +523,10 @@ PyTypeObject* getPythonTypeObject(const char* typeName) bool pythonTypeIsValueType(const SbkConverter *converter) { - assert(converter); + // Unlikely to happen but for multi-inheritance SbkObjs + // the converter is not defined, hence we need a default return. + if (!converter) + return false; return converter->pointerToPython && converter->copyToPython; } diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index 5a12eeccd..3cc80860d 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -798,7 +798,7 @@ <value-type name="Event"> <enum-type name="EventType"/> - <enum-type name="EventTypeClass" class="yes"/> + <enum-type name="EventTypeClass"/> </value-type> <value-type name="BlackBox"> |
