From c630f1c87a77ccd7fb80782d48743e70dec56ae0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 26 Sep 2025 09:45:16 +0200 Subject: libpyside: Add globals structure Put global data into a struct which in the future will exist per interpreter as interpreters can only share immortal objects. Task-number: PYSIDE-3155 Change-Id: I45ccaac57b41219bd4bd6a9151f820b00a787b0e Reviewed-by: Cristian Maureira-Fredes --- sources/pyside6/libpyside/pyside.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sources/pyside6/libpyside/pyside.cpp') diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index ca467c6c1..9901aefae 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -11,6 +11,7 @@ #include "pyside_p.h" #include "signalmanager.h" #include "pysideclassinfo_p.h" +#include "pysideglobals_p.h" #include "pysideproperty_p.h" #include "class_property.h" #include "pysideproperty.h" @@ -1020,18 +1021,16 @@ bool registerInternalQtConf() return isRegistered; } -static PyTypeObject *qObjType = nullptr; - PyTypeObject *qObjectType() { - PyTypeObject *result = qObjType; + PyTypeObject *result = globals()->qobjectType; Q_ASSERT(result); return result; } void setQObjectType(PyTypeObject *t) { - qObjType = t; + globals()->qobjectType = t; } bool isQObjectDerived(PyTypeObject *pyType, bool raiseError) -- cgit v1.2.3