Skip to content

Fix build under Qt 6.9 #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2025
Merged

Fix build under Qt 6.9 #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
133d96c
Fix PythonQt build under Qt 6.9
mrbean-bremen Jun 10, 2025
fb22865
Use Py_REFCNT instead of ob_refcnt in generated code
mrbean-bremen Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu', 'windows']
qt-version: [ '5.12.*', '5.15.*', '6.7.*', '6.8.*' ]
qt-version: [ '5.12.*', '5.15.*', '6.8.*', '6.9.*' ]
python-version: [ '3.12' ]
runs-on: ${{ matrix.os }}-latest
steps:
Expand All @@ -36,7 +36,7 @@ jobs:
with:
version: ${{ matrix.qt-version }}
modules: ${{startsWith(matrix.qt-version, '6') && 'qt5compat qtscxml qtpositioning qtwebchannel qtmultimedia qtwebengine' || '' }}
arch: ${{ (matrix.os == 'ubuntu' && (startsWith(matrix.qt-version, '5') && 'gcc_64' || 'linux_gcc_64')) || startsWith(matrix.qt-version, '5.12') && 'win64_msvc2017_64' || startsWith(matrix.qt-version, '6.8') && 'win64_msvc2022_64' || 'win64_msvc2019_64' }}
arch: ${{ (matrix.os == 'ubuntu' && (startsWith(matrix.qt-version, '5') && 'gcc_64' || 'linux_gcc_64')) || startsWith(matrix.qt-version, '5.12') && 'win64_msvc2017_64' || startsWith(matrix.qt-version, '6') && 'win64_msvc2022_64' || 'win64_msvc2019_64' }}

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
Expand Down
462 changes: 231 additions & 231 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core0.cpp
View file
Open in desktop

Large diffs are not rendered by default.

226 changes: 113 additions & 113 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core1.cpp
View file
Open in desktop

Large diffs are not rendered by default.

204 changes: 102 additions & 102 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core2.cpp
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ PythonQtShell_QVariantAnimation::~PythonQtShell_QVariantAnimation() {
}
void PythonQtShell_QVariantAnimation::childEvent(QChildEvent* arg__1)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("childEvent");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand All @@ -289,7 +289,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
void PythonQtShell_QVariantAnimation::customEvent(QEvent* arg__1)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("customEvent");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand All @@ -308,7 +308,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
int PythonQtShell_QVariantAnimation::duration() const
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("duration");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand Down Expand Up @@ -338,7 +338,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
bool PythonQtShell_QVariantAnimation::event(QEvent* event0)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("event");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand Down Expand Up @@ -368,7 +368,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
bool PythonQtShell_QVariantAnimation::eventFilter(QObject* arg__1, QEvent* arg__2)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("eventFilter");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand Down Expand Up @@ -398,7 +398,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
QVariant PythonQtShell_QVariantAnimation::interpolated(const QVariant& from0, const QVariant& to1, qreal progress2) const
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("interpolated");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand Down Expand Up @@ -428,7 +428,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
void PythonQtShell_QVariantAnimation::timerEvent(QTimerEvent* arg__1)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("timerEvent");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand All @@ -447,7 +447,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
void PythonQtShell_QVariantAnimation::updateCurrentTime(int arg__1)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateCurrentTime");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand All @@ -466,7 +466,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
void PythonQtShell_QVariantAnimation::updateCurrentValue(const QVariant& value0)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateCurrentValue");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand All @@ -485,7 +485,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
void PythonQtShell_QVariantAnimation::updateDirection(QAbstractAnimation::Direction direction0)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateDirection");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand All @@ -504,7 +504,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
void PythonQtShell_QVariantAnimation::updateState(QAbstractAnimation::State newState0, QAbstractAnimation::State oldState1)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("updateState");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand Down Expand Up @@ -649,7 +649,7 @@ PythonQtShell_QXmlStreamEntityResolver::~PythonQtShell_QXmlStreamEntityResolver(
}
QString PythonQtShell_QXmlStreamEntityResolver::resolveEntity(const QString& publicId0, const QString& systemId1)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("resolveEntity");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand Down Expand Up @@ -679,7 +679,7 @@ if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
}
QString PythonQtShell_QXmlStreamEntityResolver::resolveUndeclaredEntity(const QString& name0)
{
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
if (_wrapper && (Py_REFCNT((PyObject*)_wrapper) > 0)) {
static PyObject* name = PyString_FromString("resolveUndeclaredEntity");
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
if (obj) {
Expand Down
Loading
Loading