diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-11-26 16:54:26 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-12-08 08:48:50 +0100 |
| commit | 59de6f6e6ed1d556d3f2d1bd9804fd237484d840 (patch) | |
| tree | 5cffe4ce44c3dd8c6c29291b71951df9b53591f7 /sources/pyside6/libpyside/pyside.cpp | |
| parent | b10dd95b7c48845ae49244ab8a264ab0f6192368 (diff) | |
PySide6: Move the mutex for locking QObject allocation helpers to libpyside
Qml and Quick were using 2 different mutexes, which does not make
sense.
Task-number: PYSIDE-1709
Change-Id: Id0ec0f780c1d24e40a7f072dea62964ecf92e9d2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
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.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index 05c0e7486..b2bf0ed69 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -71,6 +71,7 @@ #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QFileInfo> +#include <QtCore/QMutex> #include <QtCore/QSharedPointer> #include <QtCore/QStack> #include <QtCore/QThread> @@ -387,6 +388,12 @@ bool inherits(PyTypeObject *objType, const char *class_name) return inherits(base, class_name); } +QMutex &nextQObjectMemoryAddrMutex() +{ + static QMutex mutex; + return mutex; +} + void *nextQObjectMemoryAddr() { return qobjectNextAddr; |