aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/libpyside/pyside.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2025-09-26 09:45:16 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2025-10-02 17:42:48 +0200
commitc630f1c87a77ccd7fb80782d48743e70dec56ae0 (patch)
tree7cc6954d0431a1c306b1c33a55d286cc391796e6 /sources/pyside6/libpyside/pyside.cpp
parent83cbfe0bc6ee4b7f8441bff10d76982966e78628 (diff)
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 <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pyside.cpp')
-rw-r--r--sources/pyside6/libpyside/pyside.cpp7
1 files changed, 3 insertions, 4 deletions
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)