diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-05-12 19:00:44 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:21 -0300 |
commit | f592efca989138d4bf25fedd60f3e4483c4722c4 (patch) | |
tree | aa784c73b2ef6b8c371e1360434748744b3f8ba5 /PySide | |
parent | 93ea992d35224a28a70c3c189366b5c4c8ed85fc (diff) |
Add since attribute for classes and enums added on Qt4.6 and Qt4.7.
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtCore/typesystem_core.xml | 92 | ||||
-rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 89 | ||||
-rw-r--r-- | PySide/QtNetwork/typesystem_network.xml | 4 | ||||
-rw-r--r-- | PySide/QtOpenGL/typesystem_opengl.xml | 8 | ||||
-rw-r--r-- | PySide/QtScript/typesystem_script.xml | 2 | ||||
-rw-r--r-- | PySide/QtScriptTools/typesystem_scripttools.xml | 2 | ||||
-rw-r--r-- | PySide/QtTest/typesystem_test.xml | 8 | ||||
-rw-r--r-- | PySide/QtWebKit/typesystem_webkit.xml | 16 | ||||
-rw-r--r-- | PySide/QtXmlPatterns/typesystem_xmlpatterns.xml | 4 |
9 files changed, 114 insertions, 111 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 9d39fea86..a1dd5b676 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -22,26 +22,26 @@ <load-typesystem name="typesystem_templates.xml" generate="no"/> <function signature="qAcos(qreal)" /> - <function signature="qAsin(qreal)" /> - <function signature="qAtan(qreal)" /> - <function signature="qAtan2(qreal,qreal)" /> + <function signature="qAsin(qreal)" since="4.6" /> + <function signature="qAtan(qreal)" since="4.6" /> + <function signature="qAtan2(qreal,qreal)" since="4.6" /> <function signature="qChecksum(const char*,uint)" /> <function signature="qCritical(const char*)" /> <function signature="qDebug(const char*)" /> - <function signature="qExp(qreal)" /> - <function signature="qFabs(qreal)" /> - <function signature="qFastCos(qreal)" /> - <function signature="qFastSin(qreal)" /> + <function signature="qExp(qreal)" since="4.6" /> + <function signature="qFabs(qreal)" since="4.6" /> + <function signature="qFastCos(qreal)" since="4.6"/> + <function signature="qFastSin(qreal)" since="4.6" /> <function signature="qFatal(const char*)" /> <function signature="qFuzzyCompare(double,double)" /> - <function signature="qFuzzyIsNull(double)" /> + <function signature="qFuzzyIsNull(double)" since="4.6" /> <function signature="qIsFinite(double)" /> <function signature="qIsInf(double)" /> <function signature="qIsNaN(double)" /> <function signature="qIsNull(double)" /> <function signature="qRound(qreal)" /> - <function signature="qTan(qreal)" /> - <function signature="qtTrId(const char *, int)" /> + <function signature="qTan(qreal)" since="4.6" /> + <function signature="qtTrId(const char *, int)" since="4.6" /> <function signature="qVersion()" /> <function signature="qWarning(const char*)" /> <function signature="qrand()" /> @@ -246,7 +246,7 @@ <namespace-type name="Qt"> <enum-type name="AlignmentFlag" flags="Alignment" /> <enum-type name="AnchorAttribute"/> - <enum-type name="AnchorPoint"/> + <enum-type name="AnchorPoint" since="4.6" /> <enum-type name="ApplicationAttribute"/> <enum-type name="ArrowType"/> <enum-type name="AspectRatioMode"/> @@ -258,7 +258,7 @@ <enum-type name="ClipOperation"/> <enum-type name="ConnectionType"/> <enum-type name="ContextMenuPolicy"/> - <enum-type name="CoordinateSystem"/> + <enum-type name="CoordinateSystem" since="4.6"/> <enum-type name="Corner"/> <enum-type name="CursorShape" /> <enum-type name="DateFormat" /> @@ -270,13 +270,13 @@ <enum-type name="FillRule"/> <enum-type name="FocusPolicy"/> <enum-type name="FocusReason"/> - <enum-type name="GestureFlag" flags="GestureFlags"/> - <enum-type name="GestureState"/> - <enum-type name="GestureType"/> + <enum-type name="GestureFlag" flags="GestureFlags" since="4.6"/> + <enum-type name="GestureState" since="4.6"/> + <enum-type name="GestureType" since="4.6"/> <enum-type name="GlobalColor"/> <enum-type name="HitTestAccuracy"/> <enum-type name="ImageConversionFlag" flags="ImageConversionFlags" /> - <enum-type name="InputMethodHint" flags="InputMethodHints"/> + <enum-type name="InputMethodHint" flags="InputMethodHints" since="4.6"/> <enum-type name="InputMethodQuery"/> <enum-type name="ItemDataRole" force-integer="yes" /> <enum-type name="ItemFlag" flags="ItemFlags"/> @@ -288,7 +288,7 @@ <enum-type name="MatchFlag" flags="MatchFlags"/> <enum-type name="Modifier"/> <enum-type name="MouseButton" flags="MouseButtons"/> - <enum-type name="NavigationMode"/> + <enum-type name="NavigationMode" since="4.6"/> <enum-type name="Orientation" flags="Orientations"/> <enum-type name="PenCapStyle"/> <enum-type name="PenJoinStyle"/> @@ -302,12 +302,12 @@ <enum-type name="TextFlag"/> <enum-type name="TextFormat"/> <enum-type name="TextInteractionFlag" flags="TextInteractionFlags"/> - <enum-type name="TileRule"/> + <enum-type name="TileRule" since="4.6"/> <enum-type name="TimeSpec"/> <enum-type name="ToolBarArea" flags="ToolBarAreas" /> <enum-type name="ToolBarAreaSizes"/> <enum-type name="ToolButtonStyle"/> - <enum-type name="TouchPointState"/> + <enum-type name="TouchPointState" since="4.6"/> <enum-type name="TransformationMode"/> <enum-type name="UIEffect"/> <enum-type name="WhiteSpaceMode" /> @@ -1545,20 +1545,20 @@ <modify-function signature="indexOf(QString,int)const" remove="all" /> <modify-function signature="insert(int,const char*)" remove="all" /> <modify-function signature="insert(int,char)" remove="all" /> - <modify-function signature="insert(int,const char*,int)" remove="all" /> + <modify-function signature="insert(int,const char*,int)" since="4.6" remove="all" /> <modify-function signature="insert(int,QString)" remove="all" /> <modify-function signature="lastIndexOf(const char*,int)const" remove="all" /> <modify-function signature="lastIndexOf(QString,int)const" remove="all" /> <modify-function signature="lastIndexOf(char,int)const" remove="all" /> <modify-function signature="prepend(const char*)" remove="all" /> - <modify-function signature="prepend(const char*,int)" remove="all" /> + <modify-function signature="prepend(const char*,int)" since="4.6" remove="all" /> <modify-function signature="replace(QByteArray,const char*)" remove="all" /> <modify-function signature="replace(const char*,int,const char*,int)" remove="all"/> <modify-function signature="replace(QString,const char*)" remove="all" /> <modify-function signature="replace(const char*,QByteArray)" remove="all" /> <modify-function signature="replace(const char*,const char*)" remove="all" /> <modify-function signature="replace(int,int,const char*)" remove="all" /> - <modify-function signature="replace(int,int,const char*,int)" remove="all" /> + <modify-function signature="replace(int,int,const char*,int)" since="4.6" remove="all" /> <modify-function signature="replace(char,const char*)" remove="all" /> <modify-function signature="replace(char,QString)" remove="all" /> <modify-function signature="startsWith(const char*)const" remove="all" /> @@ -2383,7 +2383,7 @@ </template> <object-type name="QDataStream" stream="yes"> - <enum-type name="FloatingPointPrecision"/> + <enum-type name="FloatingPointPrecision" since="4.6"/> <enum-type name="Status"/> <enum-type name="Version"/> <enum-type name="ByteOrder"/> @@ -2704,7 +2704,7 @@ <object-type name="QXmlStreamReader"> <enum-type name="Error"/> <enum-type name="TokenType"/> - <enum-type name="ReadElementTextBehaviour"/> + <enum-type name="ReadElementTextBehaviour" since="4.6"/> </object-type> <object-type name="QXmlStreamWriter"> <!-- Removed because it expect QString to be mutable --> @@ -2764,15 +2764,15 @@ <modify-function signature="enclosingMetaObject()const" remove="all" /> </value-type> <!-- From Qt4.6 --> - <object-type name="QAbstractAnimation"> + <object-type name="QAbstractAnimation" since="4.6"> <enum-type name="DeletionPolicy"/> <enum-type name="Direction"/> <enum-type name="State"/> </object-type> - <object-type name="QAbstractState"/> + <object-type name="QAbstractState" since="4.6" /> - <object-type name="QAbstractTransition"> + <object-type name="QAbstractTransition" since="4.6"> <modify-function signature="QAbstractTransition(QState*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2819,7 +2819,7 @@ </object-type> - <object-type name="QAnimationGroup"> + <object-type name="QAnimationGroup" since="4.6"> <modify-function signature="addAnimation(QAbstractAnimation*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2862,13 +2862,13 @@ Se also bug: http://bugs.pyside.org/show_bug.cgi?id=725 --> - <rejection class="QEasingCurve" function-name="setCustomType"/> - <value-type name="QEasingCurve"> - <enum-type name="Type"/> + <rejection class="QEasingCurve" function-name="setCustomType" /> + <value-type name="QEasingCurve" since="4.6"> + <enum-type name="Type" /> <modify-function signature="customType() const" remove="all"/> </value-type> - <object-type name="QEventTransition"> + <object-type name="QEventTransition" since="4.6"> <modify-function signature="QEventTransition(QState*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -2883,25 +2883,25 @@ </object-type> - <object-type name="QFinalState"/> + <object-type name="QFinalState" since="4.6" /> - <object-type name="QHistoryState"> + <object-type name="QHistoryState" since="4.6"> <enum-type name="HistoryType" /> </object-type> - <value-type name="QMargins"/> + <value-type name="QMargins" since="4.6"/> - <object-type name="QParallelAnimationGroup"/> + <object-type name="QParallelAnimationGroup" since="4.6"/> - <object-type name="QPauseAnimation"/> + <object-type name="QPauseAnimation" since="4.6"/> - <value-type name="QProcessEnvironment"/> + <value-type name="QProcessEnvironment" since="4.6"/> - <object-type name="QPropertyAnimation"/> + <object-type name="QPropertyAnimation" since="4.6"/> - <object-type name="QSequentialAnimationGroup"/> + <object-type name="QSequentialAnimationGroup" since="4.6"/> - <object-type name="QSignalTransition"> + <object-type name="QSignalTransition" since="4.6"> <add-function signature="QSignalTransition(PyObject*, QState*)" return-type="QSignalTransition*"> <modify-argument index="2"> <replace-default-expression with="0" /> @@ -2921,7 +2921,7 @@ </add-function> </object-type> - <object-type name="QState"> + <object-type name="QState" since="4.6"> <enum-type name="ChildMode"/> <modify-function signature="addTransition(QAbstractTransition*)"> <modify-argument index="1"> @@ -2976,13 +2976,13 @@ </modify-function> </object-type> - <object-type name="QStateMachine"> + <object-type name="QStateMachine" since="4.6"> <enum-type name="Error"/> <enum-type name="EventPriority"/> <enum-type name="RestorePolicy"/> - <value-type name="SignalEvent"/> - <value-type name="WrappedEvent"/> + <value-type name="SignalEvent" since="4.6"/> + <value-type name="WrappedEvent" since="4.6"/> <modify-function signature="addState(QAbstractState *)"> <modify-argument index="1"> @@ -3020,7 +3020,7 @@ </add-function> </object-type> - <object-type name="QVariantAnimation"/> + <object-type name="QVariantAnimation" since="4.6"/> <!-- From Qt4.6 ^^^ --> diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index d4c53b75d..482234059 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -1222,7 +1222,7 @@ <insert-template name="fix_qreal*,qreal*,qreal*,qreal*,qreal*"/> </inject-code> </modify-function> - <modify-function signature="getHsl(int*,int*,int*,int*)const"> + <modify-function signature="getHsl(int*,int*,int*,int*)const" since="4.6"> <modify-argument index="0"> <replace-type modified-type="PyObject *" /> </modify-argument> @@ -1245,7 +1245,7 @@ </insert-template> </inject-code> </modify-function> - <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const"> + <modify-function signature="getHslF(qreal*,qreal*,qreal*,qreal*)const" since="4.6"> <modify-argument index="0"> <replace-type modified-type="PyObject *" /> </modify-argument> @@ -1582,7 +1582,7 @@ <enum-type name="Extension"/> <enum-type name="GraphicsItemChange"/> <enum-type name="GraphicsItemFlag" flags="GraphicsItemFlags"/> - <enum-type name="PanelModality"/> + <enum-type name="PanelModality" since="4.6"/> <inject-code class="target" position="end"> PyObject* userTypeConstant = PyInt_FromLong(QGraphicsItem::UserType); PyDict_SetItemString(Sbk_QGraphicsItem_Type.super.ht_type.tp_dict, "UserType", userTypeConstant); @@ -1658,7 +1658,7 @@ <modify-function signature="inputMethodEvent(QInputMethodEvent*)"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> - <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const"> + <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" since="4.6"> <modify-argument index="1"> <remove-argument/> </modify-argument> @@ -2846,7 +2846,7 @@ <object-type name="QMouseEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"/> <object-type name="QPaintEvent" copyable= "false" polymorphic-id-expression="%1->type() == QEvent::Paint"/> <object-type name="QAccessibleEvent" polymorphic-id-expression="%1->type() == QEvent::AccessibilityDescription || %1->type() == QEvent::AccessibilityHelp"/> - <object-type name="QGestureEvent" polymorphic-id-expression="%1->type() == QEvent::Gesture || %1->type() == QEvent::GestureOverride"> + <object-type name="QGestureEvent" polymorphic-id-expression="%1->type() == QEvent::Gesture || %1->type() == QEvent::GestureOverride" since="4.6"> <modify-function signature="activeGestures()const"> <modify-argument index="return"> <define-ownership owner="default"/> @@ -2880,7 +2880,7 @@ <enum-type name="ControlElement" extensible="yes"/> <enum-type name="PixelMetric" extensible="yes" /> <enum-type name="PrimitiveElement" extensible="yes" /> - <enum-type name="RequestSoftwareInputPanel"/> + <enum-type name="RequestSoftwareInputPanel" since="4.6"/> <enum-type name="StandardPixmap" extensible="yes"/> <enum-type name="StateFlag" flags="State"/> <enum-type name="StyleHint" extensible="yes" /> @@ -5103,8 +5103,8 @@ <object-type name="QAction"> <enum-type name="ActionEvent"/> <enum-type name="MenuRole"/> - <enum-type name="Priority"/> - <enum-type name="SoftKeyRole"/> + <enum-type name="Priority" since="4.6"/> + <enum-type name="SoftKeyRole" since="4.6"/> <modify-function signature="setMenu(QMenu*)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -5786,7 +5786,7 @@ </modify-function> </object-type> - <value-type name="QMatrix2x2"> + <value-type name="QMatrix2x2" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -5856,7 +5856,7 @@ <add-function signature="operator==(const QMatrix2x2&)" return-type="bool" /> </value-type> - <value-type name="QMatrix2x3"> + <value-type name="QMatrix2x3" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -5926,7 +5926,7 @@ <add-function signature="operator==(const QMatrix2x3&)" return-type="bool" /> </value-type> - <value-type name="QMatrix2x4"> + <value-type name="QMatrix2x4" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -5996,7 +5996,7 @@ <add-function signature="operator==(const QMatrix2x4&)" return-type="bool" /> </value-type> - <value-type name="QMatrix3x2"> + <value-type name="QMatrix3x2" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -6066,7 +6066,7 @@ <add-function signature="operator==(const QMatrix3x2&)" return-type="bool" /> </value-type> - <value-type name="QMatrix3x3"> + <value-type name="QMatrix3x3" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -6136,7 +6136,7 @@ <add-function signature="operator==(const QMatrix3x3&)" return-type="bool" /> </value-type> - <value-type name="QMatrix3x4"> + <value-type name="QMatrix3x4" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -6206,7 +6206,7 @@ <add-function signature="operator==(const QMatrix3x4&)" return-type="bool" /> </value-type> - <value-type name="QMatrix4x2"> + <value-type name="QMatrix4x2" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -6276,7 +6276,7 @@ <add-function signature="operator==(const QMatrix4x2&)" return-type="bool" /> </value-type> - <value-type name="QMatrix4x3"> + <value-type name="QMatrix4x3" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -6346,8 +6346,7 @@ <add-function signature="operator==(const QMatrix4x3&)" return-type="bool" /> </value-type> - - <value-type name="QMatrix4x4"> + <value-type name="QMatrix4x4" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code_matrix"> @@ -6437,23 +6436,23 @@ </add-function> </value-type> - <object-type name="QGesture"> + <object-type name="QGesture" since="4.6"> <enum-type name="GestureCancelPolicy"/> </object-type> - <object-type name="QGestureRecognizer"> + <object-type name="QGestureRecognizer" since="4.6"> <enum-type name="ResultFlag" flags="Result"/> </object-type> - <object-type name="QTapAndHoldGesture"/> - <object-type name="QTapGesture"/> - <object-type name="QGraphicsAnchor"/> - <object-type name="QGraphicsAnchorLayout"/> - <object-type name="QGraphicsBlurEffect"> + <object-type name="QTapAndHoldGesture" since="4.6"/> + <object-type name="QTapGesture" since="4.6"/> + <object-type name="QGraphicsAnchor" since="4.6"/> + <object-type name="QGraphicsAnchorLayout" since="4.6"/> + <object-type name="QGraphicsBlurEffect" since="4.6"> <enum-type name="BlurHint" flags="BlurHints"/> </object-type> - <object-type name="QGraphicsColorizeEffect"/> - <object-type name="QGraphicsDropShadowEffect"/> + <object-type name="QGraphicsColorizeEffect" since="4.6"/> + <object-type name="QGraphicsDropShadowEffect" since="4.6"/> - <object-type name="QGraphicsEffect"> + <object-type name="QGraphicsEffect" since="4.6"> <enum-type name="ChangeFlag" flags="ChangeFlags"/> <enum-type name="PixmapPadMode"/> </object-type> @@ -6462,18 +6461,18 @@ <object-type name="QGraphicsEffectSource"/> --> - <object-type name="QGraphicsObject" /> - <object-type name="QGraphicsOpacityEffect"/> - <object-type name="QGraphicsRotation"/> - <object-type name="QGraphicsScale"/> - <object-type name="QGraphicsTransform"/> - <object-type name="QKeyEventTransition"/> - <object-type name="QMouseEventTransition"/> - <object-type name="QPanGesture"/> - <object-type name="QPinchGesture"> + <object-type name="QGraphicsObject" since="4.6" /> + <object-type name="QGraphicsOpacityEffect" since="4.6"/> + <object-type name="QGraphicsRotation" since="4.6"/> + <object-type name="QGraphicsScale" since="4.6"/> + <object-type name="QGraphicsTransform" since="4.6"/> + <object-type name="QKeyEventTransition" since="4.6"/> + <object-type name="QMouseEventTransition" since="4.6"/> + <object-type name="QPanGesture" since="4.6"/> + <object-type name="QPinchGesture" since="4.6"> <enum-type name="ChangeFlag" flags="ChangeFlags"/> </object-type> - <value-type name="QQuaternion"> + <value-type name="QQuaternion" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> @@ -6505,18 +6504,18 @@ </object-type> --> - <object-type name="QSwipeGesture"> + <object-type name="QSwipeGesture" since="4.6"> <enum-type name="SwipeDirection"/> </object-type> - <value-type name="QTileRules"/> + <value-type name="QTileRules" since="4.6"/> - <object-type name="QTouchEvent"> + <object-type name="QTouchEvent" since="4.6"> <enum-type name="DeviceType"/> - <value-type name="TouchPoint"/> + <value-type name="TouchPoint" since="4.6"/> </object-type> - <value-type name="QVector2D"> + <value-type name="QVector2D" since="4.6"> <add-function signature="__repr__" return-type="PyObject*"> <inject-code class="target" position="beginning"> <insert-template name="repr_code"> @@ -6535,7 +6534,7 @@ </inject-code> </add-function> </value-type> - <value-type name="QVector3D"> + <value-type name="QVector3D" since="4.6"> <extra-includes> <include file-name="QMatrix4x4" location="global"/> </extra-includes> @@ -6557,7 +6556,7 @@ </inject-code> </add-function> </value-type> - <value-type name="QVector4D"> + <value-type name="QVector4D" since="4.6"> <extra-includes> <include file-name="QMatrix4x4" location="global"/> </extra-includes> diff --git a/PySide/QtNetwork/typesystem_network.xml b/PySide/QtNetwork/typesystem_network.xml index 5ed175553..969eb863b 100644 --- a/PySide/QtNetwork/typesystem_network.xml +++ b/PySide/QtNetwork/typesystem_network.xml @@ -37,7 +37,7 @@ <object-type name="QAbstractSocket"> <enum-type name="NetworkLayerProtocol"/> <enum-type name="SocketError"/> - <enum-type name="SocketOption"/> + <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>)" allow-thread="yes" /> @@ -191,7 +191,7 @@ <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"/> + <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++"/> diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml index 6855bf38d..b694400ee 100644 --- a/PySide/QtOpenGL/typesystem_opengl.xml +++ b/PySide/QtOpenGL/typesystem_opengl.xml @@ -44,7 +44,7 @@ <rejection class="QGLContext" field-name="currentCtx" /> <object-type name="QGLContext"> - <enum-type name="BindOption" flags="BindOptions"/> + <enum-type name="BindOption" flags="BindOptions" since="4.6"/> <modify-function signature="chooseContext(const QGLContext*)"> <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> @@ -87,11 +87,11 @@ <!-- ### --> </object-type> - <value-type name="QGLFramebufferObjectFormat"/> - <object-type name="QGLShader"> + <value-type name="QGLFramebufferObjectFormat" since="4.6"/> + <object-type name="QGLShader" since="4.6"> <enum-type name="ShaderTypeBit" flags="ShaderType"/> </object-type> - <object-type name="QGLShaderProgram"> + <object-type name="QGLShaderProgram" since="4.6"> <!-- ### Use QMatrixZxY overloads --> <modify-function signature="setUniformValue(int, Array)" remove="all" /> <modify-function signature="setUniformValue(const char*, Array)" remove="all" /> diff --git a/PySide/QtScript/typesystem_script.xml b/PySide/QtScript/typesystem_script.xml index 7c28a4018..870aec089 100644 --- a/PySide/QtScript/typesystem_script.xml +++ b/PySide/QtScript/typesystem_script.xml @@ -43,7 +43,7 @@ </object-type> <object-type name="QScriptExtensionInterface"/> <object-type name="QScriptExtensionPlugin"/> - <value-type name="QScriptProgram"/> + <value-type name="QScriptProgram" since="4.7"/> <value-type name="QScriptString"/> <value-type name="QScriptValue"> <enum-type name="PropertyFlag" flags="PropertyFlags"/> diff --git a/PySide/QtScriptTools/typesystem_scripttools.xml b/PySide/QtScriptTools/typesystem_scripttools.xml index d22311290..5c2b5e0dc 100644 --- a/PySide/QtScriptTools/typesystem_scripttools.xml +++ b/PySide/QtScriptTools/typesystem_scripttools.xml @@ -24,7 +24,7 @@ <object-type name="QScriptEngineDebugger"> <enum-type name="DebuggerAction"/> - <enum-type name="DebuggerState"/> + <enum-type name="DebuggerState" since="4.6"/> <enum-type name="DebuggerWidget"/> <extra-includes> <include file-name="QScriptEngine" location="global"/> diff --git a/PySide/QtTest/typesystem_test.xml b/PySide/QtTest/typesystem_test.xml index 85de89f88..9897225f8 100644 --- a/PySide/QtTest/typesystem_test.xml +++ b/PySide/QtTest/typesystem_test.xml @@ -54,9 +54,9 @@ <rejection class="QTest" function-name="touchEvent"/> <namespace-type name="QTest"> - <enum-type name="AttributeIndex"/> + <enum-type name="AttributeIndex" since="4.6"/> <enum-type name="KeyAction"/> - <enum-type name="LogElementType"/> + <enum-type name="LogElementType" since="4.6"/> <enum-type name="MouseAction"/> <enum-type name="QBenchmarkMetric" since="4.7"/> <enum-type name="SkipMode"/> @@ -66,7 +66,7 @@ </extra-includes> <!--<modify-function signature="qCompare<char>(char">--> <rejection class="QTouchEventSequence"/> - <object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" > + <object-type name="PySideQTouchEventSequence" target-lang-name="QTouchEventSequence" since="4.6" > <modify-function signature="press(int, const QPoint&, QWidget*)"> <modify-argument index="return"> <define-ownership class="target" owner="default"/> @@ -88,7 +88,7 @@ </modify-argument> </modify-function> </object-type> - <modify-function signature="generateTouchEvent(QWidget*, QTouchEvent::DeviceType)" rename="touchEvent"> + <modify-function signature="generateTouchEvent(QWidget*, QTouchEvent::DeviceType)" rename="touchEvent" since="4.6"> <modify-argument index="return"> <define-ownership class="target" owner="target"/> </modify-argument> diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml index 177a29c16..45f498ef9 100644 --- a/PySide/QtWebKit/typesystem_webkit.xml +++ b/PySide/QtWebKit/typesystem_webkit.xml @@ -47,7 +47,7 @@ <modify-function signature="print(QPrinter*)const" rename="print_" /> </object-type> <object-type name="QWebFrame"> - <enum-type name="RenderLayer"/> + <enum-type name="RenderLayer" since="4.6"/> <modify-function signature="addToJavaScriptWindowObject(QString,QObject*)"> <modify-argument index="2"> <parent index="this" action="add"/> @@ -82,7 +82,7 @@ <enum-type name="WebAction"/> <enum-type name="WebWindowType"/> <!-- Qt 4.6 --> - <enum-type name="ErrorDomain"/> + <enum-type name="ErrorDomain" since="4.6"/> <enum-type name="Extension"/> <value-type name="ChooseMultipleFilesExtensionOption" /> @@ -99,8 +99,10 @@ // Cast the parameters according to the extension type if (extension == QWebPage::ChooseMultipleFilesExtension) %out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionOption*](reinterpret_cast<const ChooseMultipleFilesExtensionOption*>(option)); + #if QT_VERSION >= 0x040600 else if (extension == QWebPage::ErrorPageExtension) %out = %CONVERTTOPYTHON[ErrorPageExtensionOption*](reinterpret_cast<const ErrorPageExtensionOption*>(option)); + #endif </conversion-rule> </modify-argument> <modify-argument index="3" invalidate-after-use="yes"> @@ -109,8 +111,10 @@ // Cast the parameters according to the extension type if (extension == QWebPage::ChooseMultipleFilesExtension) %out = %CONVERTTOPYTHON[ChooseMultipleFilesExtensionReturn*](reinterpret_cast<const ChooseMultipleFilesExtensionReturn*>(output)); + #if QT_VERSION >= 0x040600 else if (extension == QWebPage::ErrorPageExtension) %out = %CONVERTTOPYTHON[ErrorPageExtensionReturn*](reinterpret_cast<const ErrorPageExtensionReturn*>(output)); + #endif </conversion-rule> </modify-argument> </modify-function> @@ -166,10 +170,10 @@ <value-type name="QWebSecurityOrigin"/> <!-- Qt 4.6 --> - <object-type name="QGraphicsWebView"/> - <object-type name="QWebInspector"/> - <value-type name="QWebElement"> + <object-type name="QGraphicsWebView" since="4.6"/> + <object-type name="QWebInspector" since="4.6"/> + <value-type name="QWebElement" since="4.6"> <enum-type name="StyleResolveStrategy"/> </value-type> - <value-type name="QWebElementCollection"/> + <value-type name="QWebElementCollection" since="4.6"/> </typesystem> diff --git a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml index 51fca16af..665b302c0 100644 --- a/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml +++ b/PySide/QtXmlPatterns/typesystem_xmlpatterns.xml @@ -21,8 +21,8 @@ <typesystem package="PySide.QtXmlPatterns"> <load-typesystem name="typesystem_core.xml" generate="no"/> - <object-type name="QXmlSchema"/> <!-- Qt scoped pointer does not allow declare this as value type --> - <object-type name="QXmlSchemaValidator"> + <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-argument index="return"> <replace-type modified-type="QXmlSchema*"/> |