Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-PyQt6 for openSUSE:Factory
checked in at 2022-06-26 11:58:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyQt6 (Old)
and /work/SRC/openSUSE:Factory/.python-PyQt6.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyQt6"
Sun Jun 26 11:58:42 2022 rev:10 rq:985022 version:6.3.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyQt6/python-PyQt6.changes
2022-04-16 00:14:42.513685898 +0200
+++ /work/SRC/openSUSE:Factory/.python-PyQt6.new.1548/python-PyQt6.changes
2022-06-26 11:58:45.356309208 +0200
@@ -1,0 +2,20 @@
+Mon Jun 20 21:35:19 UTC 2022 - Ben Greiner <c...@bnavigator.de>
+
+- Update to version 6.3.1
+ * Added qRegisterResourceData() and qUnregisterResourceData() to
+ QtCore to help in supporting legacy resource files from PyQt5.
+ * Requires v13.4 of the sip module which adds support for enums
+ with missing members and the sip.array support.
+ * Reverted the Qt.GestureType related changes made in v6.2.3 as
+ they are no longer necessary with the support for missing enum
+ members.
+ * The QEvent constructor that takes an int argument is now
+ deprecated.
+ * Refactored the draw methods of QPainter to accept sip.array
+ objects of appropriate types. Such arrays, once initialised,
+ can be used very efficiently as they do not require repeated
+ conversion from the usual Python collection types.
+ * Added resize() to QPolygon, QPolygonF and QXmlStreamAttributes.
+ * Bug fixes.
+
+-------------------------------------------------------------------
Old:
----
PyQt6-6.3.0.tar.gz
New:
----
PyQt6-6.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyQt6.spec ++++++
--- /var/tmp/diff_new_pack.BVC07I/_old 2022-06-26 11:58:45.860309942 +0200
+++ /var/tmp/diff_new_pack.BVC07I/_new 2022-06-26 11:58:45.864309947 +0200
@@ -16,13 +16,11 @@
#
-%{?!python_module:%define python_module() python3-%{**}}
%define plainpython python
-%define skip_python2 1
%define mname PyQt6
%define pyqt_build_for_qt6 1
Name: python-%{mname}
-Version: 6.3.0
+Version: 6.3.1
Release: 0
Summary: Python bindings for Qt 6
License: GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
@@ -33,7 +31,7 @@
Patch0: disable-rpaths.diff
# PATCH-FIX-OPENSUSE - install binary dbus mainloop integration in arch
dependent directory
Patch1: 0001-Use-a-noarch-wrapper-for-dbus-mainloop-integration.patch
-BuildRequires: %{python_module PyQt6-sip}
+BuildRequires: %{python_module PyQt6-sip >= 13.4}
BuildRequires: %{python_module dbus-python-devel >= 0.8}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pyqt-builder >= 1.11}
@@ -66,7 +64,7 @@
BuildRequires: cmake(Qt6Quick3D)
BuildRequires: cmake(Qt6Quick3DRuntimeRender)
%endif
-Requires: python-PyQt6-sip
+%requires_ge python-PyQt6-sip
%requires_ge python-dbus-python
Provides: python-qt6 = %{version}-%{release}
%python_subpackages
++++++ PyQt6-6.3.0.tar.gz -> PyQt6-6.3.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/ChangeLog new/PyQt6-6.3.1/ChangeLog
--- old/PyQt6-6.3.0/ChangeLog 2022-04-12 17:44:16.006705800 +0200
+++ new/PyQt6-6.3.1/ChangeLog 2022-06-17 17:12:18.128991100 +0200
@@ -1,3 +1,68 @@
+2022-06-17 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, qpy/QtCore/qpycore_chimera.cpp,
+ qpy/QtCore/qpycore_chimera_storage.cpp:
+ Fixed issues when emitting signals with enum arguments.
+ [247d2c1d453c] [6.3.1] <6.3-maint>
+
+2022-06-15 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Added qRegisterResourceData() and qUnregisterResourceData.
+ [4302c2940491] <6.3-maint>
+
+2022-06-06 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Reordered QPainter methods so that QPolygon[F] are not handled as
+ sequences.
+ [eeab18cf3dc2] <6.3-maint>
+
+2022-06-05 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, qpy/QtCore/qpycore_chimera.cpp:
+ Fixed the handling of char* slot arguments.
+ [d367df954b70] <6.3-maint>
+
+2022-05-20 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Refactored the QPainter draw methods to exploit sip.array objects.
+ [c6715cccc537] <6.3-maint>
+
+2022-05-17 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS:
+ Updated the NEWS file for sip.array.
+ [1adefd1499a6] <6.3-maint>
+
+2022-05-15 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp, project.py:
+ v13.4 of the sip ABI is now required (for the missing enum member
+ support). Reverted the support for using an int instead of a
+ Qt.GestureType. Deprecated (rather than removed) the QEvent ctor
+ that takes an int argument.
+ [d2ec9265d699] <6.3-maint>
+
+2022-05-01 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Fixes for building against a debug version of Python.
+ [94918729af61] <6.3-maint>
+
+2022-04-19 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Added resize() to QPolygon, QPolygonF and QXmlStreamAttributes.
+ [b6869cdce5ce] <6.3-maint>
+
+2022-04-12 Phil Thompson <p...@riverbankcomputing.com>
+
+ * .hgtags:
+ Added tag 6.3.0 for changeset 373bc2a6447e
+ [22bcfae615cd]
+
2022-04-01 Phil Thompson <p...@riverbankcomputing.com>
* PyQt6.msp:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/NEWS new/PyQt6-6.3.1/NEWS
--- old/PyQt6-6.3.0/NEWS 2022-04-12 17:44:16.008317000 +0200
+++ new/PyQt6-6.3.1/NEWS 2022-06-17 17:12:18.130319000 +0200
@@ -1,3 +1,18 @@
+v6.3.1 17th June 2022
+ - Added qRegisterResourceData() and qUnregisterResourceData() to QtCore to
+ help in supporting legacy resource files from PyQt5.
+ - Requires v13.4 of the sip module which adds support for enums with missing
+ members and the sip.array support.
+ - Reverted the Qt.GestureType related changes made in v6.2.3 as they are no
+ longer necessary with the support for missing enum members.
+ - The QEvent constructor that takes an int argument is now deprecated.
+ - Refactored the draw methods of QPainter to accept sip.array objects of
+ appropriate types. Such arrays, once initialised, can be used very
+ efficiently as they do not require repeated conversion from the usual
+ Python collection types.
+ - Added resize() to QPolygon, QPolygonF and QXmlStreamAttributes.
+ - Bug fixes.
+
v6.3.0 1st April 2022
- Added support for Qt v6.3.
- Bug fixes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/PKG-INFO new/PyQt6-6.3.1/PKG-INFO
--- old/PyQt6-6.3.0/PKG-INFO 2022-04-12 17:44:24.403901300 +0200
+++ new/PyQt6-6.3.1/PKG-INFO 2022-06-17 17:12:26.259375600 +0200
@@ -1,13 +1,13 @@
Metadata-Version: 2.1
Name: PyQt6
-Version: 6.3.0
+Version: 6.3.1
Requires-Python: >=3.6.1
Summary: Python bindings for the Qt cross platform application toolkit
Home-Page: https://www.riverbankcomputing.com/software/pyqt/
Author: Riverbank Computing Limited
Author-Email: i...@riverbankcomputing.com
License: GPL v3
-Requires-Dist: PyQt6-sip (>=13.2, <14)
+Requires-Dist: PyQt6-sip (>=13.4, <14)
PyQt6 - Comprehensive Python Bindings for Qt v6
===============================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/project.py new/PyQt6-6.3.1/project.py
--- old/PyQt6-6.3.0/project.py 2022-04-12 17:44:16.243242300 +0200
+++ new/PyQt6-6.3.1/project.py 2022-06-17 17:12:18.364701000 +0200
@@ -28,7 +28,7 @@
# The minimum sip module ABI version needed.
-ABI_VERSION = '13.2'
+ABI_VERSION = '13.4'
class PyQt(PyQtProject):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/pyproject.toml
new/PyQt6-6.3.1/pyproject.toml
--- old/PyQt6-6.3.0/pyproject.toml 2022-04-12 17:44:16.243608200 +0200
+++ new/PyQt6-6.3.1/pyproject.toml 2022-06-17 17:12:18.364948500 +0200
@@ -6,7 +6,7 @@
# Specify the PEP 566 metadata for the project.
[tool.sip.metadata]
name = "PyQt6"
-version = "6.3.0"
+version = "6.3.1"
summary = "Python bindings for the Qt cross platform application toolkit"
home-page = "https://www.riverbankcomputing.com/software/pyqt/";
author = "Riverbank Computing Limited"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/qpy/QtCore/qpycore_chimera.cpp
new/PyQt6-6.3.1/qpy/QtCore/qpycore_chimera.cpp
--- old/PyQt6-6.3.0/qpy/QtCore/qpycore_chimera.cpp 2022-04-12
17:44:16.058374600 +0200
+++ new/PyQt6-6.3.1/qpy/QtCore/qpycore_chimera.cpp 2022-06-17
17:12:18.177399000 +0200
@@ -1501,11 +1501,24 @@
{
// SIP knows the type (therefore it isn't really wrapped in a
// PyQt_PyObject) but it's not registered with Qt.
+ if (sipTypeIsEnum(_type))
+ return sipConvertFromEnum(*reinterpret_cast<int *>(cpp),
_type);
+
if (_name.endsWith('*'))
cpp = *reinterpret_cast<void **>(cpp);
return sipConvertFromType(cpp, _type, 0);
}
+ else if (_is_char_star)
+ {
+ char *s = *reinterpret_cast<char **>(cpp);
+
+ if (s)
+ return PyBytes_FromString(s);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
else
{
// Otherwise unwrap the Python object.
@@ -1527,7 +1540,7 @@
PyObject *py = 0;
- switch (typeId())
+ switch (metatype.id())
{
case QMetaType::Nullptr:
py = Py_None;
@@ -1634,23 +1647,6 @@
py = variant_pair.fromMappedType(cpp);
break;
- case -1:
- {
- char *s = *reinterpret_cast<char **>(cpp);
-
- if (s)
- {
- py = PyBytes_FromString(s);
- }
- else
- {
- Py_INCREF(Py_None);
- py = Py_None;
- }
-
- break;
- }
-
default:
if (_type)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/qpy/QtCore/qpycore_chimera_storage.cpp
new/PyQt6-6.3.1/qpy/QtCore/qpycore_chimera_storage.cpp
--- old/PyQt6-6.3.0/qpy/QtCore/qpycore_chimera_storage.cpp 2022-04-12
17:44:16.090237600 +0200
+++ new/PyQt6-6.3.1/qpy/QtCore/qpycore_chimera_storage.cpp 2022-06-17
17:12:18.206844800 +0200
@@ -96,6 +96,9 @@
// Return true if the value is a pointer type.
bool Chimera::Storage::isPointerType() const
{
+ if (_parsed_type->isEnumOrFlag())
+ return false;
+
return (_parsed_type->metatype == QMetaType::fromType<PyQt_PyObject>() &&
_parsed_type->typeDef());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtCore/QtCoremod.sip
new/PyQt6-6.3.1/sip/QtCore/QtCoremod.sip
--- old/PyQt6-6.3.0/sip/QtCore/QtCoremod.sip 2022-04-12 17:44:23.313178300
+0200
+++ new/PyQt6-6.3.1/sip/QtCore/QtCoremod.sip 2022-06-17 17:12:25.237427200
+0200
@@ -73,8 +73,8 @@
const char *PYQT_VERSION_STR;
%ModuleCode
-static int PYQT_VERSION = 0x060300;
-static const char *PYQT_VERSION_STR = "6.3.0";
+static int PYQT_VERSION = 0x060301;
+static const char *PYQT_VERSION_STR = "6.3.1";
%End
%Include qglobal.sip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtCore/qbytearray.sip
new/PyQt6-6.3.1/sip/QtCore/qbytearray.sip
--- old/PyQt6-6.3.0/sip/QtCore/qbytearray.sip 2022-04-12 17:44:23.392575300
+0200
+++ new/PyQt6-6.3.1/sip/QtCore/qbytearray.sip 2022-06-17 17:12:25.283943000
+0200
@@ -99,13 +99,20 @@
%End
%BIGetBufferCode
- Q_UNUSED(sipSelf);
+ // We may be building against a debug Python build.
- sipBuffer->bd_buffer = sipCpp->data();
- sipBuffer->bd_length = sipCpp->size();
- sipBuffer->bd_readonly = 0;
+ #if defined(Py_LIMITED_API)
+ Q_UNUSED(sipSelf);
- sipRes = 0;
+ sipBuffer->bd_buffer = sipCpp->data();
+ sipBuffer->bd_length = sipCpp->size();
+ sipBuffer->bd_readonly = 0;
+
+ sipRes = 0;
+ #else
+ sipRes = PyBuffer_FillInfo(sipBuffer, sipSelf, sipCpp->data(),
+ sipCpp->size(), 0, sipFlags);
+ #endif
%End
%PickleCode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtCore/qcoreevent.sip
new/PyQt6-6.3.1/sip/QtCore/qcoreevent.sip
--- old/PyQt6-6.3.0/sip/QtCore/qcoreevent.sip 2022-04-12 17:44:23.308069200
+0200
+++ new/PyQt6-6.3.1/sip/QtCore/qcoreevent.sip 2022-06-17 17:12:25.232056000
+0200
@@ -203,13 +203,17 @@
};
explicit QEvent(QEvent::Type type);
- QEvent(int type) /NoDerived/;
+ QEvent(int type) /Deprecated, NoDerived/;
%MethodCode
+ // This overload allows an int to be passed as is rather than being
wrapped in
+ // a QEvent.Type. This was usefull before enums supported missing
members and
+ // is now deprecated.
+
sipCpp = new sipQEvent(static_cast<QEvent::Type>(a0));
%End
virtual ~QEvent();
- int type() const [QEvent::Type ()];
+ QEvent::Type type() const;
bool spontaneous() const;
virtual void setAccepted(bool accepted);
bool isAccepted() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtCore/qglobal.sip
new/PyQt6-6.3.1/sip/QtCore/qglobal.sip
--- old/PyQt6-6.3.0/sip/QtCore/qglobal.sip 2022-04-12 17:44:23.386804600
+0200
+++ new/PyQt6-6.3.1/sip/QtCore/qglobal.sip 2022-06-17 17:12:25.278417000
+0200
@@ -51,6 +51,16 @@
int qRound(qreal d);
qint64 qRound64(qreal d);
const char *qVersion();
+// Minimal support for the Qt resource system to help porting from PyQt5.
+%ModuleCode
+QT_BEGIN_NAMESPACE
+extern bool qRegisterResourceData(int, const unsigned char *, const unsigned
char *, const unsigned char *);
+extern bool qUnregisterResourceData(int, const unsigned char *, const unsigned
char *, const unsigned char *);
+QT_END_NAMESPACE
+%End
+
+bool qRegisterResourceData(int, const unsigned char *, const unsigned char *,
const unsigned char *);
+bool qUnregisterResourceData(int, const unsigned char *, const unsigned char
*, const unsigned char *);
bool qFuzzyCompare(double p1, double p2);
typedef void *QFunctionPointer;
// Mapped type for qintptr.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtCore/qxmlstream.sip
new/PyQt6-6.3.1/sip/QtCore/qxmlstream.sip
--- old/PyQt6-6.3.0/sip/QtCore/qxmlstream.sip 2022-04-12 17:44:23.357986700
+0200
+++ new/PyQt6-6.3.1/sip/QtCore/qxmlstream.sip 2022-06-17 17:12:25.267394000
+0200
@@ -303,6 +303,7 @@
void prepend(const QXmlStreamAttribute &value);
void remove(int i);
void remove(int i, int count);
+void resize(qsizetype size);
void replace(int i, const QXmlStreamAttribute &value);
int size() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtGui/qpainter.sip
new/PyQt6-6.3.1/sip/QtGui/qpainter.sip
--- old/PyQt6-6.3.0/sip/QtGui/qpainter.sip 2022-04-12 17:44:22.885185700
+0200
+++ new/PyQt6-6.3.1/sip/QtGui/qpainter.sip 2022-06-17 17:12:24.990704800
+0200
@@ -187,6 +187,9 @@
void strokePath(const QPainterPath &path, const QPen &pen);
void fillPath(const QPainterPath &path, const QBrush &brush);
void drawPath(const QPainterPath &path);
+ void drawPoints(const QPolygonF &points);
+ void drawPoints(const QPolygon &points);
+ void drawPoints(const QPointF *points /Array/, int pointCount /ArraySize/);
void drawPoints(const QPointF *point, ...);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -200,7 +203,7 @@
sipIsErr = 1;
%End
- void drawPoints(const QPolygonF &points);
+ void drawPoints(const QPoint *points /Array/, int pointCount /ArraySize/);
void drawPoints(const QPoint *point, ...);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -214,7 +217,7 @@
sipIsErr = 1;
%End
- void drawPoints(const QPolygon &points);
+ void drawLines(const QLineF *lines /Array/, int lineCount /ArraySize/);
void drawLines(const QLineF *line, ...);
%MethodCode
QLineF *lines = qtgui_inst_array<QLineF>(a0, a1, sipType_QLineF);
@@ -228,7 +231,11 @@
sipIsErr = 1;
%End
- void drawLines(const QList<QLineF> &lines);
+ void drawLines(const QPointF *pointPairs /Array/, int lineCount
/ArraySize/);
+%MethodCode
+ sipCpp->drawLines(a0, a1 / 2);
+%End
+
void drawLines(const QPointF *pointPair, ...);
%MethodCode
QPointF *pairs = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -242,7 +249,7 @@
sipIsErr = 1;
%End
- void drawLines(const QList<QPointF> &pointPairs);
+ void drawLines(const QLine *lines /Array/, int lineCount /ArraySize/);
void drawLines(const QLine *line, ...);
%MethodCode
QLine *lines = qtgui_inst_array<QLine>(a0, a1, sipType_QLine);
@@ -256,7 +263,11 @@
sipIsErr = 1;
%End
- void drawLines(const QList<QLine> &lines);
+ void drawLines(const QPoint *pointPairs /Array/, int lineCount
/ArraySize/);
+%MethodCode
+ sipCpp->drawLines(a0, a1 / 2);
+%End
+
void drawLines(const QPoint *pointPair, ...);
%MethodCode
QPoint *pairs = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -270,7 +281,7 @@
sipIsErr = 1;
%End
- void drawLines(const QList<QPoint> &pointPairs);
+ void drawRects(const QRectF *rects /Array/, int rectCount /ArraySize/);
void drawRects(const QRectF *rect, ...);
%MethodCode
QRectF *rects = qtgui_inst_array<QRectF>(a0, a1, sipType_QRectF);
@@ -284,7 +295,7 @@
sipIsErr = 1;
%End
- void drawRects(const QList<QRectF> &rectangles);
+ void drawRects(const QRect *rects /Array/, int rectCount /ArraySize/);
void drawRects(const QRect *rect, ...);
%MethodCode
QRect *rects = qtgui_inst_array<QRect>(a0, a1, sipType_QRect);
@@ -298,9 +309,11 @@
sipIsErr = 1;
%End
- void drawRects(const QList<QRect> &rectangles);
void drawEllipse(const QRectF &r);
void drawEllipse(const QRect &r);
+ void drawPolyline(const QPolygonF &polyline);
+ void drawPolyline(const QPolygon &polyline);
+ void drawPolyline(const QPointF *points /Array/, int pointCount
/ArraySize/);
void drawPolyline(const QPointF *point, ...);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -314,7 +327,7 @@
sipIsErr = 1;
%End
- void drawPolyline(const QPolygonF &polyline);
+ void drawPolyline(const QPoint *points /Array/, int pointCount
/ArraySize/);
void drawPolyline(const QPoint *point, ...);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -328,7 +341,9 @@
sipIsErr = 1;
%End
- void drawPolyline(const QPolygon &polyline);
+ void drawPolygon(const QPolygonF &points, Qt::FillRule fillRule =
Qt::OddEvenFill);
+ void drawPolygon(const QPolygon &points, Qt::FillRule fillRule =
Qt::OddEvenFill);
+ void drawPolygon(const QPointF *points /Array/, int pointCount
/ArraySize/, Qt::FillRule fillRule = Qt::OddEvenFill);
void drawPolygon(const QPointF *point, ...);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -342,7 +357,7 @@
sipIsErr = 1;
%End
- void drawPolygon(const QPolygonF &points, Qt::FillRule fillRule =
Qt::OddEvenFill);
+ void drawPolygon(const QPoint *points /Array/, int pointCount /ArraySize/,
Qt::FillRule fillRule = Qt::OddEvenFill);
void drawPolygon(const QPoint *point, ...);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -356,7 +371,9 @@
sipIsErr = 1;
%End
- void drawPolygon(const QPolygon &points, Qt::FillRule fillRule =
Qt::OddEvenFill);
+ void drawConvexPolygon(const QPolygonF &poly);
+ void drawConvexPolygon(const QPolygon &poly);
+ void drawConvexPolygon(const QPointF *points /Array/, int pointCount
/ArraySize/);
void drawConvexPolygon(const QPointF *point, ...);
%MethodCode
QPointF *points = qtgui_inst_array<QPointF>(a0, a1, sipType_QPointF);
@@ -370,7 +387,7 @@
sipIsErr = 1;
%End
- void drawConvexPolygon(const QPolygonF &poly);
+ void drawConvexPolygon(const QPoint *points /Array/, int pointCount
/ArraySize/);
void drawConvexPolygon(const QPoint *point, ...);
%MethodCode
QPoint *points = qtgui_inst_array<QPoint>(a0, a1, sipType_QPoint);
@@ -384,7 +401,6 @@
sipIsErr = 1;
%End
- void drawConvexPolygon(const QPolygon &poly);
void drawArc(const QRectF &rect, int a, int alen);
void drawPie(const QRectF &rect, int a, int alen);
void drawChord(const QRectF &rect, int a, int alen);
@@ -518,30 +534,7 @@
};
typedef QFlags<QPainter::PixmapFragmentHint> PixmapFragmentHints;
- void drawPixmapFragments(SIP_PYLIST fragments
/TypeHint="List[QPainter.PixmapFragment]"/, const QPixmap &pixmap,
QPainter::PixmapFragmentHints hints = QPainter::PixmapFragmentHints());
-%MethodCode
- // Allocate temporary storage for the C++ conversions.
- Py_ssize_t numFragments = PyList_Size(a0);
- QPainter::PixmapFragment *fragments = new
QPainter::PixmapFragment[numFragments];
-
- // Convert the fragments.
- for (Py_ssize_t i = 0; i < numFragments; ++i)
- {
- void *cpp = sipForceConvertToType(PyList_GetItem(a0, i),
sipType_QPainter_PixmapFragment, NULL, SIP_NO_CONVERTORS, NULL, &sipIsErr);
-
- fragments[i] = *reinterpret_cast<QPainter::PixmapFragment *>(cpp);
- }
-
- if (!sipIsErr)
- {
- Py_BEGIN_ALLOW_THREADS
- sipCpp->drawPixmapFragments(fragments, numFragments, *a1, *a2);
- Py_END_ALLOW_THREADS
- }
-
- delete[] fragments;
-%End
-
+ void drawPixmapFragments(const QPainter::PixmapFragment *fragments
/Array/, int fragmentCount /ArraySize/, const QPixmap &pixmap,
QPainter::PixmapFragmentHints hints = QPainter::PixmapFragmentHints());
void drawStaticText(const QPointF &topLeftPosition, const QStaticText
&staticText);
void drawStaticText(const QPoint &p, const QStaticText &staticText);
void drawStaticText(int x, int y, const QStaticText &staticText);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtGui/qpolygon.sip
new/PyQt6-6.3.1/sip/QtGui/qpolygon.sip
--- old/PyQt6-6.3.0/sip/QtGui/qpolygon.sip 2022-04-12 17:44:22.849973400
+0200
+++ new/PyQt6-6.3.1/sip/QtGui/qpolygon.sip 2022-06-17 17:12:24.969988600
+0200
@@ -134,6 +134,7 @@
void remove(int i);
void remove(int i, int count);
void replace(int i, const QPoint &value);
+void resize(qsizetype size);
int size() const;
QPoint value(int i) const;
QPoint value(int i, const QPoint &defaultValue) const;
@@ -325,6 +326,7 @@
void remove(int i);
void remove(int i, int count);
void replace(int i, const QPointF &value);
+void resize(qsizetype size);
int size() const;
QPointF value(int i) const;
QPointF value(int i, const QPointF &defaultValue) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtWidgets/qgesture.sip
new/PyQt6-6.3.1/sip/QtWidgets/qgesture.sip
--- old/PyQt6-6.3.0/sip/QtWidgets/qgesture.sip 2022-04-12 17:44:23.153316700
+0200
+++ new/PyQt6-6.3.1/sip/QtWidgets/qgesture.sip 2022-06-17 17:12:25.148069600
+0200
@@ -29,7 +29,7 @@
public:
explicit QGesture(QObject *parent /TransferThis/ = 0);
virtual ~QGesture();
- int gestureType() const [Qt::GestureType ()];
+ Qt::GestureType gestureType() const;
Qt::GestureState state() const;
QPointF hotSpot() const;
void setHotSpot(const QPointF &value);
@@ -171,11 +171,7 @@
explicit QGestureEvent(const QList<QGesture *> &gestures);
virtual ~QGestureEvent();
QList<QGesture *> gestures() const;
- QGesture *gesture(int type) const;
-%MethodCode
- sipRes = sipCpp->gesture(Qt::GestureType(a0));
-%End
-
+ QGesture *gesture(Qt::GestureType type) const;
QList<QGesture *> activeGestures() const;
QList<QGesture *> canceledGestures() const;
void setAccepted(bool accepted);
@@ -186,26 +182,10 @@
void accept(QGesture *);
void ignore(QGesture *);
bool isAccepted(QGesture *) const;
- void setAccepted(int, bool);
-%MethodCode
- sipCpp->setAccepted(Qt::GestureType(a0), a1);
-%End
-
- void accept(int);
-%MethodCode
- sipCpp->accept(Qt::GestureType(a0));
-%End
-
- void ignore(int);
-%MethodCode
- sipCpp->ignore(Qt::GestureType(a0));
-%End
-
- bool isAccepted(int) const;
-%MethodCode
- sipRes = sipCpp->isAccepted(Qt::GestureType(a0));
-%End
-
+ void setAccepted(Qt::GestureType, bool);
+ void accept(Qt::GestureType);
+ void ignore(Qt::GestureType);
+ bool isAccepted(Qt::GestureType) const;
QWidget *widget() const;
QPointF mapToGraphicsScene(const QPointF &gesturePoint) const;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtWidgets/qgesturerecognizer.sip
new/PyQt6-6.3.1/sip/QtWidgets/qgesturerecognizer.sip
--- old/PyQt6-6.3.0/sip/QtWidgets/qgesturerecognizer.sip 2022-04-12
17:44:23.150926800 +0200
+++ new/PyQt6-6.3.1/sip/QtWidgets/qgesturerecognizer.sip 2022-06-17
17:12:25.145337000 +0200
@@ -43,9 +43,6 @@
virtual QGesture *create(QObject *target) /Factory/;
virtual QFlags<QGestureRecognizer::ResultFlag> recognize(QGesture *state,
QObject *watched, QEvent *event) = 0;
virtual void reset(QGesture *state);
- static int registerRecognizer(QGestureRecognizer *recognizer /Transfer/)
[Qt::GestureType (QGestureRecognizer *recognizer)];
- static void unregisterRecognizer(int type);
-%MethodCode
- QGestureRecognizer::unregisterRecognizer(Qt::GestureType(a0));
-%End
+ static Qt::GestureType registerRecognizer(QGestureRecognizer *recognizer
/Transfer/);
+ static void unregisterRecognizer(Qt::GestureType type);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtWidgets/qgraphicsitem.sip
new/PyQt6-6.3.1/sip/QtWidgets/qgraphicsitem.sip
--- old/PyQt6-6.3.0/sip/QtWidgets/qgraphicsitem.sip 2022-04-12
17:44:23.185985800 +0200
+++ new/PyQt6-6.3.1/sip/QtWidgets/qgraphicsitem.sip 2022-06-17
17:12:25.155786500 +0200
@@ -605,15 +605,8 @@
public:
explicit QGraphicsObject(QGraphicsItem *parent /TransferThis/ = 0);
virtual ~QGraphicsObject();
- void grabGesture(int type, Qt::GestureFlags flags = Qt::GestureFlags());
-%MethodCode
- sipCpp->grabGesture(Qt::GestureType(a0), *a1);
-%End
-
- void ungrabGesture(int type);
-%MethodCode
- sipCpp->ungrabGesture(Qt::GestureType(a0));
-%End
+ void grabGesture(Qt::GestureType type, Qt::GestureFlags flags =
Qt::GestureFlags());
+ void ungrabGesture(Qt::GestureType type);
signals:
void parentChanged();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtWidgets/qscroller.sip
new/PyQt6-6.3.1/sip/QtWidgets/qscroller.sip
--- old/PyQt6-6.3.0/sip/QtWidgets/qscroller.sip 2022-04-12 17:44:23.090738500
+0200
+++ new/PyQt6-6.3.1/sip/QtWidgets/qscroller.sip 2022-06-17 17:12:25.107160800
+0200
@@ -52,8 +52,8 @@
static bool hasScroller(QObject *target);
static QScroller *scroller(QObject *target);
- static int grabGesture(QObject *target, QScroller::ScrollerGestureType
scrollGestureType = QScroller::TouchGesture) [Qt::GestureType (QObject *target,
QScroller::ScrollerGestureType scrollGestureType = QScroller::TouchGesture)];
- static int grabbedGesture(QObject *target) [Qt::GestureType (QObject
*target)];
+ static Qt::GestureType grabGesture(QObject *target,
QScroller::ScrollerGestureType scrollGestureType = QScroller::TouchGesture);
+ static Qt::GestureType grabbedGesture(QObject *target);
static void ungrabGesture(QObject *target);
static QList<QScroller *> activeScrollers();
QObject *target() const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.3.0/sip/QtWidgets/qwidget.sip
new/PyQt6-6.3.1/sip/QtWidgets/qwidget.sip
--- old/PyQt6-6.3.0/sip/QtWidgets/qwidget.sip 2022-04-12 17:44:23.098815200
+0200
+++ new/PyQt6-6.3.1/sip/QtWidgets/qwidget.sip 2022-06-17 17:12:25.115237000
+0200
@@ -469,16 +469,8 @@
QGraphicsProxyWidget *graphicsProxyWidget() const;
QGraphicsEffect *graphicsEffect() const;
void setGraphicsEffect(QGraphicsEffect *effect /Transfer/);
- void grabGesture(int type, Qt::GestureFlags flags = Qt::GestureFlags());
-%MethodCode
- sipCpp->grabGesture(Qt::GestureType(a0), *a1);
-%End
-
- void ungrabGesture(int type);
-%MethodCode
- sipCpp->ungrabGesture(Qt::GestureType(a0));
-%End
-
+ void grabGesture(Qt::GestureType type, Qt::GestureFlags flags =
Qt::GestureFlags());
+ void ungrabGesture(Qt::GestureType type);
void setContentsMargins(const QMargins &margins);
QMargins contentsMargins() const;
QWidget *previousInFocusChain() const;
