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 2021-12-09 19:45:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyQt6 (Old)
and /work/SRC/openSUSE:Factory/.python-PyQt6.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyQt6"
Thu Dec 9 19:45:26 2021 rev:7 rq:935719 version:6.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyQt6/python-PyQt6.changes
2021-11-04 16:10:29.717079272 +0100
+++ /work/SRC/openSUSE:Factory/.python-PyQt6.new.2520/python-PyQt6.changes
2021-12-09 19:45:51.641140516 +0100
@@ -1,0 +2,8 @@
+Fri Dec 3 14:36:02 UTC 2021 - Ben Greiner <c...@bnavigator.de>
+
+- Update to version 6.2.2
+ * Added the missing QBluetoothUuid constructors.
+ * Added the missing QMediaPlayer loop-related methods.
+ * Bug fixes.
+
+-------------------------------------------------------------------
Old:
----
PyQt6-6.2.1.tar.gz
New:
----
PyQt6-6.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyQt6.spec ++++++
--- /var/tmp/diff_new_pack.TZa4IG/_old 2021-12-09 19:45:52.241140805 +0100
+++ /var/tmp/diff_new_pack.TZa4IG/_new 2021-12-09 19:45:52.241140805 +0100
@@ -17,11 +17,12 @@
%{?!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.2.1
+Version: 6.2.2
Release: 0
Summary: Python bindings for Qt 6
License: GPL-3.0-only OR SUSE-GPL-2.0-with-FLOSS-exception OR NonFree
@@ -36,7 +37,7 @@
BuildRequires: %{python_module dbus-python-devel >= 0.8}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pyqt-builder >= 1.11}
-BuildRequires: %{python_module sip-devel >= 6.4}
+BuildRequires: %{python_module sip-devel >= 6.5}
BuildRequires: dbus-1-devel
BuildRequires: dos2unix
BuildRequires: fdupes
@@ -97,6 +98,7 @@
Requires: cmake(Qt6Svg)
Requires: cmake(Qt6WebChannel)
Requires: cmake(Qt6WebSockets)
+Requires: %plainpython(abi) = %{python_version}
# SECTION not packaged for 6.2 yet
# Requires: cmake(Qt6Quick3D)
# Requires: cmake(Qt6Quick3DRuntimeRender)
++++++ PyQt6-6.2.1.tar.gz -> PyQt6-6.2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/ChangeLog new/PyQt6-6.2.2/ChangeLog
--- old/PyQt6-6.2.1/ChangeLog 2021-10-28 12:18:08.722375400 +0200
+++ new/PyQt6-6.2.2/ChangeLog 2021-12-01 18:09:31.277833700 +0100
@@ -1,5 +1,81 @@
+2021-12-01 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Added the missing QMediaPlayer loop-related methods.
+ [dd1923cdf995] [6.2.2] <6.2-maint>
+
+2021-11-29 Phil Thompson <p...@riverbankcomputing.com>
+
+ * PyQt6.msp:
+ Fixed the toString(), toDisplayString() and toEncoded() methods of
+ QUrl to accept QUrl.ComponentFormattingOptions flags.
+ [94ac53ce9297] <6.2-maint>
+
+ * NEWS, PyQt6.msp:
+ Use a dedicated QEventLoop in the event hook as Qt6 seems to hide
+ windows when the main event loop exits.
+ [0b618767ac61] <6.2-maint>
+
+2021-11-24 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Fixed the QListWidgetItem.ItemType and QTreeWidgetItem.ItemType
+ enums.
+ [fc30342b6025] <6.2-maint>
+
+2021-11-22 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Added /Constrained/ to the QVariant serialiser so that it doesn't
+ act as a catchall and bypass all subsequent serialisers (including
+ slot extenders).
+ [ce7d2be67940] <6.2-maint>
+
+2021-11-21 Phil Thompson <p...@riverbankcomputing.com>
+
+ * project.py:
+ Update the minimum ABI version of the sip module.
+ [6e81d758b971] <6.2-maint>
+
+ * PyQt6.msp:
+ Qt.FocusPolicy members are now flags.
+ [6f4ebc7b30e4] <6.2-maint>
+
+ * NEWS, PyQt6.msp, pyproject.toml:
+ Fixed the QStyle enums that have a custom base value so that the
+ value is unsigned and can be added to.
+ [8cd2a8c92b07] <6.2-maint>
+
+2021-11-19 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, extras/uic/uiparser.py:
+ Fixed pyuic handling of alignment flags.
+ [2c1990da7bb3] <6.2-maint>
+
+2021-11-18 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Added the missing QBluetoothUuid ctors.
+ [a26c8d542c4a] <6.2-maint>
+
+2021-11-16 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, PyQt6.msp:
+ Fixed the QBluetoothDeviceDiscoveryAgent.DiscoveryMethod enum.
+ [a3c9210b471e] <6.2-maint>
+
+2021-11-15 Phil Thompson <p...@riverbankcomputing.com>
+
+ * NEWS, extras/uic/enum_map.py:
+ Fixes for pyuic handling of QFormLayout enums.
+ [3c3c854f3f80] <6.2-maint>
+
2021-10-28 Phil Thompson <p...@riverbankcomputing.com>
+ * .hgtags:
+ Added tag 6.2.1 for changeset a2c450b78bfa
+ [cda76ceff903] <6.2-maint>
+
* NEWS, PyQt6.msp:
Added the QLowEnergyController.mtuChanged() signal which is now
documented in Qtv v6.2.1.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/NEWS new/PyQt6-6.2.2/NEWS
--- old/PyQt6-6.2.1/NEWS 2021-10-28 12:18:08.723260200 +0200
+++ new/PyQt6-6.2.2/NEWS 2021-12-01 18:09:31.279331400 +0100
@@ -1,3 +1,8 @@
+v6.2.2 1st December 2021
+ - Added the missing QBluetoothUuid constructors.
+ - Added the missing QMediaPlayer loop-related methods.
+ - Bug fixes.
+
v6.2.1 28th October 2021
- Bug fixes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/PKG-INFO new/PyQt6-6.2.2/PKG-INFO
--- old/PyQt6-6.2.1/PKG-INFO 2021-10-28 12:18:16.577184700 +0200
+++ new/PyQt6-6.2.2/PKG-INFO 2021-12-01 18:09:39.570798200 +0100
@@ -1,12 +1,13 @@
Metadata-Version: 2.1
Name: PyQt6
-Version: 6.2.1
+Version: 6.2.2
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)
PyQt6 - Comprehensive Python Bindings for Qt v6
===============================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/project.py new/PyQt6-6.2.2/project.py
--- old/PyQt6-6.2.1/project.py 2021-10-28 12:18:08.905231000 +0200
+++ new/PyQt6-6.2.2/project.py 2021-12-01 18:09:31.506892400 +0100
@@ -27,14 +27,20 @@
UserException)
+# The minimum sip module ABI version needed.
+ABI_VERSION = '13.2'
+
+
class PyQt(PyQtProject):
""" The PyQt6 project. """
def __init__(self):
""" Initialise the project. """
- super().__init__(dunder_init=True, tag_prefix='Qt',
- console_scripts=[
+ # We specify the name of the sip module because PyQt-builder doesn't
+ # provide it if we are creating an sdist.
+ super().__init__(abi_version=ABI_VERSION, sip_module='PyQt6.sip',
+ dunder_init=True, tag_prefix='Qt', console_scripts=[
'pylupdate6 = PyQt6.lupdate.pylupdate:main',
'pyuic6 = PyQt6.uic.pyuic:main'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/pyproject.toml
new/PyQt6-6.2.2/pyproject.toml
--- old/PyQt6-6.2.1/pyproject.toml 2021-10-28 12:18:08.905485900 +0200
+++ new/PyQt6-6.2.2/pyproject.toml 2021-12-01 18:09:31.507243400 +0100
@@ -1,12 +1,12 @@
# Specify the build system for the project.
[build-system]
-requires = ["sip >=6.4, <7", "PyQt-builder >=1.11, <2"]
+requires = ["sip >=6.5, <7", "PyQt-builder >=1.11, <2"]
build-backend = "sipbuild.api"
# Specify the PEP 566 metadata for the project.
[tool.sip.metadata]
name = "PyQt6"
-version = "6.2.1"
+version = "6.2.2"
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.2.1/sip/QtBluetooth/qbluetoothdevicediscoveryagent.sip
new/PyQt6-6.2.2/sip/QtBluetooth/qbluetoothdevicediscoveryagent.sip
--- old/PyQt6-6.2.1/sip/QtBluetooth/qbluetoothdevicediscoveryagent.sip
2021-10-28 12:18:14.882382000 +0200
+++ new/PyQt6-6.2.2/sip/QtBluetooth/qbluetoothdevicediscoveryagent.sip
2021-12-01 18:09:37.811834600 +0100
@@ -64,6 +64,9 @@
public:
enum DiscoveryMethod /BaseType=Flag/
{
+ NoMethod,
+ ClassicMethod,
+ LowEnergyMethod,
};
typedef QFlags<QBluetoothDeviceDiscoveryAgent::DiscoveryMethod>
DiscoveryMethods;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtBluetooth/qbluetoothuuid.sip
new/PyQt6-6.2.2/sip/QtBluetooth/qbluetoothuuid.sip
--- old/PyQt6-6.2.1/sip/QtBluetooth/qbluetoothuuid.sip 2021-10-28
12:18:14.885457300 +0200
+++ new/PyQt6-6.2.2/sip/QtBluetooth/qbluetoothuuid.sip 2021-12-01
18:09:37.814897000 +0100
@@ -153,18 +153,6 @@
ContinuousGlucoseMonitoring,
};
- QBluetoothUuid();
- explicit QBluetoothUuid(quint32 uuid);
- explicit QBluetoothUuid(quint128 uuid);
- explicit QBluetoothUuid(const QString &uuid);
- QBluetoothUuid(const QBluetoothUuid &uuid);
- QBluetoothUuid(const QUuid &uuid);
- ~QBluetoothUuid();
- int minimumSize() const;
- quint16 toUInt16(bool *ok = 0) const;
- quint32 toUInt32(bool *ok = 0) const;
- quint128 toUInt128() const;
-
enum class CharacteristicType
{
DeviceName,
@@ -323,6 +311,21 @@
EnvironmentalSensingTriggerSetting,
};
+ QBluetoothUuid();
+ QBluetoothUuid(QBluetoothUuid::ProtocolUuid uuid);
+ QBluetoothUuid(QBluetoothUuid::ServiceClassUuid uuid);
+ QBluetoothUuid(QBluetoothUuid::CharacteristicType uuid);
+ QBluetoothUuid(QBluetoothUuid::DescriptorType uuid);
+ explicit QBluetoothUuid(quint32 uuid);
+ explicit QBluetoothUuid(quint128 uuid);
+ explicit QBluetoothUuid(const QString &uuid);
+ QBluetoothUuid(const QBluetoothUuid &uuid);
+ QBluetoothUuid(const QUuid &uuid);
+ ~QBluetoothUuid();
+ int minimumSize() const;
+ quint16 toUInt16(bool *ok = 0) const;
+ quint32 toUInt32(bool *ok = 0) const;
+ quint128 toUInt128() const;
static QString serviceClassToString(QBluetoothUuid::ServiceClassUuid uuid);
static QString protocolToString(QBluetoothUuid::ProtocolUuid uuid);
static QString characteristicToString(QBluetoothUuid::CharacteristicType
uuid);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtCore/QtCoremod.sip
new/PyQt6-6.2.2/sip/QtCore/QtCoremod.sip
--- old/PyQt6-6.2.1/sip/QtCore/QtCoremod.sip 2021-10-28 12:18:15.533343000
+0200
+++ new/PyQt6-6.2.2/sip/QtCore/QtCoremod.sip 2021-12-01 18:09:38.467576300
+0100
@@ -73,8 +73,8 @@
const char *PYQT_VERSION_STR;
%ModuleCode
-static int PYQT_VERSION = 0x060201;
-static const char *PYQT_VERSION_STR = "6.2.1";
+static int PYQT_VERSION = 0x060202;
+static const char *PYQT_VERSION_STR = "6.2.2";
%End
%Include qglobal.sip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtCore/qcoreapplication.sip
new/PyQt6-6.2.2/sip/QtCore/qcoreapplication.sip
--- old/PyQt6-6.2.1/sip/QtCore/qcoreapplication.sip 2021-10-28
12:18:15.500487600 +0200
+++ new/PyQt6-6.2.2/sip/QtCore/qcoreapplication.sip 2021-12-01
18:09:38.454408000 +0100
@@ -259,6 +259,7 @@
%ModuleCode
#include <QCoreApplication>
+#include <QEventLoop>
#include <QThread>
#if defined(Q_OS_WIN)
@@ -278,24 +279,25 @@
if (app && app->thread() == QThread::currentThread())
{
+ QEventLoop loop;
#if defined(Q_OS_WIN)
QTimer timer;
- QObject::connect(&timer, SIGNAL(timeout()), app, SLOT(quit()));
+ QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
while (!_kbhit())
{
// The delay is based on feedback from users.
timer.start(35);
- QCoreApplication::exec();
+ loop.exec();
timer.stop();
}
- QObject::disconnect(&timer, SIGNAL(timeout()), app, SLOT(quit()));
+ QObject::disconnect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
#else
QSocketNotifier notifier(0, QSocketNotifier::Read, 0);
- QObject::connect(¬ifier, SIGNAL(activated(int)), app, SLOT(quit()));
- QCoreApplication::exec();
- QObject::disconnect(¬ifier, SIGNAL(activated(int)), app,
SLOT(quit()));
+ QObject::connect(¬ifier, SIGNAL(activated(int)), &loop,
SLOT(quit()));
+ loop.exec();
+ QObject::disconnect(¬ifier, SIGNAL(activated(int)), &loop,
SLOT(quit()));
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtCore/qnamespace.sip
new/PyQt6-6.2.2/sip/QtCore/qnamespace.sip
--- old/PyQt6-6.2.1/sip/QtCore/qnamespace.sip 2021-10-28 12:18:15.544071400
+0200
+++ new/PyQt6-6.2.2/sip/QtCore/qnamespace.sip 2021-12-01 18:09:38.478320800
+0100
@@ -123,7 +123,7 @@
typedef QFlags<Qt::Orientation> Orientations;
- enum FocusPolicy
+ enum FocusPolicy /BaseType=Flag/
{
NoFocus,
TabFocus,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtCore/qurl.sip
new/PyQt6-6.2.2/sip/QtCore/qurl.sip
--- old/PyQt6-6.2.1/sip/QtCore/qurl.sip 2021-10-28 12:18:15.581522200 +0200
+++ new/PyQt6-6.2.2/sip/QtCore/qurl.sip 2021-12-01 18:09:38.517701900 +0100
@@ -120,7 +120,9 @@
static QUrl fromLocalFile(const QString &localfile);
QString toLocalFile() const;
QString toString(QUrl::FormattingOptions options =
QUrl::FormattingOptions(QUrl::PrettyDecoded)) const;
+ QString toString(QUrl::ComponentFormattingOptions options) const;
QByteArray toEncoded(QUrl::FormattingOptions options = QUrl::FullyEncoded)
const;
+ QByteArray toEncoded(QUrl::ComponentFormattingOptions options) const;
static QUrl fromEncoded(const QByteArray &u, QUrl::ParsingMode mode =
QUrl::TolerantMode);
void detach();
bool isDetached() const;
@@ -140,6 +142,7 @@
void swap(QUrl &other /Constrained/);
bool isLocalFile() const;
QString toDisplayString(QUrl::FormattingOptions options =
QUrl::FormattingOptions(QUrl::PrettyDecoded)) const;
+ QString toDisplayString(QUrl::ComponentFormattingOptions options) const;
void setQuery(const QString &query, QUrl::ParsingMode mode =
QUrl::TolerantMode);
void setQuery(const QUrlQuery &query);
QString query(QUrl::ComponentFormattingOptions options =
QUrl::PrettyDecoded) const;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtCore/qvariant.sip
new/PyQt6-6.2.2/sip/QtCore/qvariant.sip
--- old/PyQt6-6.2.1/sip/QtCore/qvariant.sip 2021-10-28 12:18:15.533985000
+0200
+++ new/PyQt6-6.2.2/sip/QtCore/qvariant.sip 2021-12-01 18:09:38.468186900
+0100
@@ -90,7 +90,7 @@
};
QDataStream &operator>>(QDataStream &s, QVariant &p /Constrained/)
/ReleaseGIL/;
-QDataStream &operator<<(QDataStream &s, const QVariant &p) /ReleaseGIL/;
+QDataStream &operator<<(QDataStream &s, const QVariant &p /Constrained/)
/ReleaseGIL/;
bool operator==(const QVariant &a, const QVariant &b);
bool operator!=(const QVariant &a, const QVariant &b);
typedef QHash<QString, QVariant> QVariantHash /TypeHint="Dict[QString,
QVariant]"/;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtMultimedia/qmediaplayer.sip
new/PyQt6-6.2.2/sip/QtMultimedia/qmediaplayer.sip
--- old/PyQt6-6.2.1/sip/QtMultimedia/qmediaplayer.sip 2021-10-28
12:18:15.435499200 +0200
+++ new/PyQt6-6.2.2/sip/QtMultimedia/qmediaplayer.sip 2021-12-01
18:09:38.368216000 +0100
@@ -118,6 +118,19 @@
void activeTracksChanged();
void errorChanged();
void errorOccurred(QMediaPlayer::Error error, const QString &errorString);
+
+public:
+ enum Loops /BaseType=IntEnum/
+ {
+ Infinite,
+ Once,
+ };
+
+ int loops() const;
+ void setLoops(int loops);
+
+signals:
+ void loopsChanged();
};
%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtMultimedia/qvideoframeformat.sip
new/PyQt6-6.2.2/sip/QtMultimedia/qvideoframeformat.sip
--- old/PyQt6-6.2.1/sip/QtMultimedia/qvideoframeformat.sip 2021-10-28
12:18:15.438291300 +0200
+++ new/PyQt6-6.2.2/sip/QtMultimedia/qvideoframeformat.sip 2021-12-01
18:09:38.371096600 +0100
@@ -61,6 +61,7 @@
Format_RGBX8888,
Format_AYUV,
Format_AYUV_Premultiplied,
+ Format_SamplerRect,
};
enum Direction
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtWidgets/qlistwidget.sip
new/PyQt6-6.2.2/sip/QtWidgets/qlistwidget.sip
--- old/PyQt6-6.2.1/sip/QtWidgets/qlistwidget.sip 2021-10-28
12:18:15.346525400 +0200
+++ new/PyQt6-6.2.2/sip/QtWidgets/qlistwidget.sip 2021-12-01
18:09:38.305337400 +0100
@@ -27,7 +27,7 @@
%End
public:
- enum ItemType
+ enum ItemType /BaseType=IntEnum/
{
Type,
UserType,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtWidgets/qstyle.sip
new/PyQt6-6.2.2/sip/QtWidgets/qstyle.sip
--- old/PyQt6-6.2.1/sip/QtWidgets/qstyle.sip 2021-10-28 12:18:15.249067500
+0200
+++ new/PyQt6-6.2.2/sip/QtWidgets/qstyle.sip 2021-12-01 18:09:38.178725500
+0100
@@ -74,7 +74,7 @@
typedef QFlags<QStyle::StateFlag> State;
- enum PrimitiveElement
+ enum PrimitiveElement /BaseType=UIntEnum/
{
PE_Frame,
PE_FrameDefaultButton,
@@ -132,7 +132,7 @@
virtual void drawPrimitive(QStyle::PrimitiveElement pe, const QStyleOption
*opt, QPainter *p, const QWidget *widget = 0) const = 0;
- enum ControlElement
+ enum ControlElement /BaseType=UIntEnum/
{
CE_PushButton,
CE_PushButtonBevel,
@@ -186,7 +186,7 @@
virtual void drawControl(QStyle::ControlElement element, const
QStyleOption *opt, QPainter *p, const QWidget *widget = 0) const = 0;
- enum SubElement
+ enum SubElement /BaseType=UIntEnum/
{
SE_PushButtonContents,
SE_PushButtonFocusRect,
@@ -251,7 +251,7 @@
virtual QRect subElementRect(QStyle::SubElement subElement, const
QStyleOption *option, const QWidget *widget = 0) const = 0;
- enum ComplexControl
+ enum ComplexControl /BaseType=UIntEnum/
{
CC_SpinBox,
CC_ComboBox,
@@ -317,7 +317,7 @@
virtual QStyle::SubControl hitTestComplexControl(QStyle::ComplexControl
cc, const QStyleOptionComplex *opt, const QPoint &pt, const QWidget *widget =
0) const = 0;
virtual QRect subControlRect(QStyle::ComplexControl cc, const
QStyleOptionComplex *opt, QStyle::SubControl sc, const QWidget *widget = 0)
const = 0;
- enum PixelMetric
+ enum PixelMetric /BaseType=UIntEnum/
{
PM_ButtonMargin,
PM_ButtonDefaultIndicator,
@@ -412,15 +412,15 @@
PM_HeaderDefaultSectionSizeVertical,
PM_TitleBarButtonIconSize,
PM_TitleBarButtonSize,
- PM_CustomBase,
%If (Qt_6_2_0 -)
PM_LineEditIconSize,
%End
+ PM_CustomBase,
};
virtual int pixelMetric(QStyle::PixelMetric metric, const QStyleOption
*option = 0, const QWidget *widget = 0) const = 0;
- enum ContentsType
+ enum ContentsType /BaseType=UIntEnum/
{
CT_PushButton,
CT_CheckBox,
@@ -450,7 +450,7 @@
virtual QSize sizeFromContents(QStyle::ContentsType ct, const QStyleOption
*opt, const QSize &contentsSize, const QWidget *widget = 0) const = 0;
- enum StyleHint
+ enum StyleHint /BaseType=UIntEnum/
{
SH_EtchDisabledText,
SH_DitherDisabledText,
@@ -568,15 +568,15 @@
SH_ComboBox_AllowWheelScrolling,
SH_SpinBox_ButtonsInsideFrame,
SH_SpinBox_StepModifier,
- SH_CustomBase,
%If (Qt_6_1_0 -)
SH_TabBar_AllowWheelScrolling,
%End
+ SH_CustomBase,
};
virtual int styleHint(QStyle::StyleHint stylehint, const QStyleOption
*option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const
= 0;
- enum StandardPixmap
+ enum StandardPixmap /BaseType=UIntEnum/
{
SP_TitleBarMenuButton,
SP_TitleBarMinButton,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/sip/QtWidgets/qtreewidget.sip
new/PyQt6-6.2.2/sip/QtWidgets/qtreewidget.sip
--- old/PyQt6-6.2.1/sip/QtWidgets/qtreewidget.sip 2021-10-28
12:18:15.343443000 +0200
+++ new/PyQt6-6.2.2/sip/QtWidgets/qtreewidget.sip 2021-12-01
18:09:38.280457000 +0100
@@ -27,7 +27,7 @@
%End
public:
- enum ItemType
+ enum ItemType /BaseType=IntEnum/
{
Type,
UserType,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/uic/enum_map.py
new/PyQt6-6.2.2/uic/enum_map.py
--- old/PyQt6-6.2.1/uic/enum_map.py 2021-10-28 12:18:08.884650500 +0200
+++ new/PyQt6-6.2.2/uic/enum_map.py 2021-12-01 18:09:31.480595000 +0100
@@ -334,6 +334,14 @@
'QFontDatabase::Runic':
'QFontDatabase::WritingSystem::Runic',
'QFontDatabase::Nko':
'QFontDatabase::WritingSystem::Nko',
+ 'QFormLayout::AllNonFixedFieldsGrow':
'QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow',
+ 'QFormLayout::ExpandingFieldsGrow':
'QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow',
+ 'QFormLayout::FieldsStayAtSizeHint':
'QFormLayout::FieldGrowthPolicy::FieldsStayAtSizeHint',
+
+ 'QFormLayout::DontWrapRows': 'QFormLayout::RowWrapPolicy::DontWrapRows',
+ 'QFormLayout::WrapLongRows': 'QFormLayout::RowWrapPolicy::WrapLongRows',
+ 'QFormLayout::WrapAllRows': 'QFormLayout::RowWrapPolicy::WrapAllRows',
+
'QFrame::Box': 'QFrame::Shape::Box',
'QFrame::HLine': 'QFrame::Shape::HLine',
'QFrame::NoFrame': 'QFrame::Shape::NoFrame',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6-6.2.1/uic/uiparser.py
new/PyQt6-6.2.2/uic/uiparser.py
--- old/PyQt6-6.2.1/uic/uiparser.py 2021-10-28 12:18:08.877740000 +0200
+++ new/PyQt6-6.2.2/uic/uiparser.py 2021-12-01 18:09:31.472306300 +0100
@@ -59,7 +59,7 @@
align_flags = None
for qt_align in alignment.split('|'):
_, qt_align = qt_align.split('::')
- align = getattr(QtCore.Qt, qt_align)
+ align = getattr(QtCore.Qt.AlignmentFlag, qt_align)
if align_flags is None:
align_flags = align
