|
207 | 207 | <enum-type name="QMdiArea::WindowOrder"/>
|
208 | 208 | <enum-type name="QMdiArea::ViewMode"/>
|
209 | 209 | <enum-type name="QFileSystemModel::Roles"/>
|
| 210 | + <enum-type name="QFileSystemModel::Option" flags="QFileSystemModel::Options"/> |
210 | 211 | <enum-type name="QFormLayout::FieldGrowthPolicy"/>
|
211 | 212 | <enum-type name="QFormLayout::FormStyle"/>
|
212 | 213 | <enum-type name="QFormLayout::ItemRole"/>
|
|
247 | 248 | <enum-type name="QFileDialog::FileMode"/>
|
248 | 249 | <enum-type name="QFileDialog::Option" flags="QFileDialog::Options"/>
|
249 | 250 | <enum-type name="QFileDialog::ViewMode"/>
|
250 |
| - <enum-type name="QFileIconProvider::IconType"/> |
| 251 | + <enum-type name="QFileIconProvider::IconType" before-version="6"/> |
| 252 | + <enum-type name="QAbstractFileIconProvider::IconType" since-version="6"/> |
251 | 253 | <enum-type name="QFont::Stretch"/>
|
252 | 254 | <enum-type name="QFont::Style"/>
|
253 | 255 | <enum-type name="QFont::StyleStrategy"/>
|
|
571 | 573 | <enum-type name="QFontDatabase::SystemFont"/>
|
572 | 574 | <enum-type name="QStyleOptionToolBox::SelectedPosition"/>
|
573 | 575 | <enum-type name="QStyleOptionToolBox::TabPosition"/>
|
574 |
| - <enum-type name="QFileIconProvider::Option" flags="QFileIconProvider::Options"/> |
| 576 | + <enum-type name="QFileIconProvider::Option" flags="QFileIconProvider::Options" before-version="6"/> |
| 577 | + <enum-type name="QAbstractFileIconProvider::Option" flags="QAbstractFileIconProvider::Options" since-version="6"/> |
575 | 578 | <enum-type name="QIconEngine::IconEngineHook"/>
|
576 | 579 | <enum-type name="QPagedPaintDevice::PageSize"/>
|
577 | 580 |
|
|
602 | 605 | <modify-function signature="operator/=(double)" access="private"/>
|
603 | 606 | <modify-function signature="operator*(QTransform)const" rename="multiplied"/>
|
604 | 607 | <modify-function signature="operator*=(QTransform)" access="private"/>
|
| 608 | + |
| 609 | + <modify-function signature="asAffineMatrix()" remove="all"/> |
605 | 610 |
|
606 | 611 | <modify-function signature="inverted(bool*)const">
|
607 | 612 | <modify-argument index="1">
|
|
777 | 782 | <modify-function signature="operator=(QTextFormat)" remove="all"/>
|
778 | 783 | <modify-function signature="isValid()const" access="non-final"/>
|
779 | 784 |
|
780 |
| - |
781 |
| - <modify-function signature="setProperty(int,QVector<QTextLength>)" rename="setLengthVectorProperty"/> |
| 785 | + <modify-function signature="setProperty(int,QVector<QTextLength>)" rename="setLengthVectorProperty" before-version="6"/> |
| 786 | + <modify-function signature="setProperty(int,const QList<QTextLength>&)" rename="setLengthVectorProperty" since-version="6"/> |
782 | 787 | </value-type>
|
783 | 788 |
|
784 | 789 | <value-type name="QTextListFormat"/>
|
|
787 | 792 | <modify-function signature="operator+(QVector<QPoint>)const" remove="all"/>
|
788 | 793 | <modify-function signature="operator<<(QPoint)" remove="all"/>
|
789 | 794 | <modify-function signature="operator<<(QVector<QPoint>)" remove="all"/>
|
790 |
| - |
791 |
| - |
792 | 795 | </value-type>
|
793 | 796 |
|
794 | 797 | <value-type name="QPolygonF">
|
|
972 | 975 |
|
973 | 976 | <extra-includes>
|
974 | 977 | <include file-name="QStringList" location="global"/>
|
975 |
| - <include file-name="QMatrix" location="global"/> |
| 978 | + <include file-name="QMatrix" location="global" before-version="6"/> |
976 | 979 | </extra-includes>
|
977 | 980 | <modify-function signature="operator=(QImage)" remove="all"/>
|
978 | 981 |
|
|
1006 | 1009 | QImage* new_QImage( const uchar * data, int width, int height, QImage::Format format )
|
1007 | 1010 | {
|
1008 | 1011 | QImage* image = new QImage(width, height, format);
|
| 1012 | +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) |
| 1013 | + memcpy(image->bits(), data, image->sizeInBytes()); |
| 1014 | +#else |
1009 | 1015 | memcpy(image->bits(), data, image->byteCount());
|
| 1016 | +#endif |
1010 | 1017 | return image;
|
1011 | 1018 | }
|
1012 | 1019 |
|
1013 | 1020 | PyObject* bits(QImage* image) {
|
1014 | 1021 | return PythonQtPrivate::wrapMemoryAsBuffer(image->bits(), image->bytesPerLine()* image->height());
|
1015 | 1022 | }
|
1016 | 1023 |
|
1017 |
| -#if QT_VERSION >= QT_VERSION_CHECK(4,7,0) |
| 1024 | +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) |
| 1025 | +PyObject* constBits(QImage* image) { |
| 1026 | + return PythonQtPrivate::wrapMemoryAsBuffer(image->constBits(), image->sizeInBytes()); |
| 1027 | +} |
| 1028 | +#elif QT_VERSION >= QT_VERSION_CHECK(4,7,0) |
1018 | 1029 | PyObject* constBits(QImage* image) {
|
1019 | 1030 | return PythonQtPrivate::wrapMemoryAsBuffer(image->constBits(), image->byteCount());
|
1020 | 1031 | }
|
@@ -1266,6 +1277,7 @@ PyObject* constScanLine(QImage* image, int line) {
|
1266 | 1277 | </object-type>
|
1267 | 1278 | <object-type name="QDoubleValidator"/>
|
1268 | 1279 | <object-type name="QFileIconProvider"/>
|
| 1280 | + <object-type name="QAbstractFileIconProvider" since-version="6"/> |
1269 | 1281 | <object-type name="QWizard">
|
1270 | 1282 | <!-- ### Requires correct class name in meta object -->
|
1271 | 1283 | <modify-function signature="setDefaultProperty(const char *, const char *, const char *)" remove="all"/>
|
@@ -1653,9 +1665,19 @@ PyObject* constScanLine(QImage* image, int line) {
|
1653 | 1665 | <object-type name="QInputEvent">
|
1654 | 1666 | <modify-function signature="modifiers()const" access="non-final"/>
|
1655 | 1667 | </object-type>
|
1656 |
| - <object-type name="QPointerEvent"/> |
1657 |
| - <object-type name="QEventPoint"/> |
1658 |
| - <object-type name="QSinglePointEvent"/> |
| 1668 | + <group since-version="6"> |
| 1669 | + <object-type name="QPointerEvent"/> |
| 1670 | + <object-type name="QEventPoint"/> |
| 1671 | + <enum-type name="QEventPoint::State" flags="QEventPoint::States" /> |
| 1672 | + <object-type name="QSinglePointEvent"/> |
| 1673 | + <object-type name="QInputDevice"/> |
| 1674 | + <enum-type name="QInputDevice::Capability" flags="QInputDevice::Capabilities"/> |
| 1675 | + <enum-type name="QInputDevice::DeviceType" flags="QInputDevice::DeviceTypes"/> |
| 1676 | + <object-type name="QPointingDevice"/> |
| 1677 | + <enum-type name="QPointingDevice::PointerType" flags="QPointingDevice::PointerTypes"/> |
| 1678 | + <value-type name="QPointingDeviceUniqueId"/> |
| 1679 | + </group> |
| 1680 | + |
1659 | 1681 | <object-type name="QGestureEvent" polymorphic-id-expression="%1->type() == QEvent::Gesture || %1->type() == QEvent::GestureOverride"/>
|
1660 | 1682 | <object-type name="QKeyEvent" polymorphic-id-expression="%1->type() == QEvent::KeyPress || %1->type() == QEvent::KeyRelease || %1->type() == QEvent::ShortcutOverride"/>
|
1661 | 1683 | <object-type name="QMouseEvent" polymorphic-id-expression="%1->type() == QEvent::MouseButtonDblClick || %1->type() == QEvent::MouseButtonPress || %1->type() == QEvent::MouseButtonRelease || %1->type() == QEvent::MouseMove"/>
|
@@ -2492,11 +2514,16 @@ PyObject* constScanLine(QImage* image, int line) {
|
2492 | 2514 | <extra-includes>
|
2493 | 2515 | <include file-name="QTextOption" location="global"/>
|
2494 | 2516 | </extra-includes>
|
2495 |
| - <modify-function signature="draw(QPainter*,const QPointF &,const QVector<QTextLayout::FormatRange> &,const QRectF &)const"> |
| 2517 | + <modify-function signature="draw(QPainter*,const QPointF &,const QVector<QTextLayout::FormatRange> &,const QRectF &)const" before-version="6"> |
2496 | 2518 | <modify-argument index="3">
|
2497 | 2519 | <replace-default-expression with="QVector<QTextLayout::FormatRange>()"/>
|
2498 | 2520 | </modify-argument>
|
2499 |
| - </modify-function> |
| 2521 | + </modify-function> |
| 2522 | + <modify-function signature="draw(QPainter*,const QPointF &,const QList<QTextLayout::FormatRange> &,const QRectF &)const" since-version="6"> |
| 2523 | + <modify-argument index="3"> |
| 2524 | + <replace-default-expression with="{}"/> |
| 2525 | + </modify-argument> |
| 2526 | + </modify-function> |
2500 | 2527 | </object-type>
|
2501 | 2528 |
|
2502 | 2529 | <object-type name="QTableWidget">
|
|
0 commit comments