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/shiboken6/generator/shiboken/cppgenerator.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/shiboken6/generator/shiboken/cppgenerator.cpp')
| -rw-r--r-- | sources/shiboken6/generator/shiboken/cppgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator.cpp b/sources/shiboken6/generator/shiboken/cppgenerator.cpp index e508b5855..f93024d55 100644 --- a/sources/shiboken6/generator/shiboken/cppgenerator.cpp +++ b/sources/shiboken6/generator/shiboken/cppgenerator.cpp @@ -3679,7 +3679,7 @@ void CppGenerator::writeMethodCall(TextStream &s, const AbstractMetaFunctionCPtr Indentation indent(uva); uva << "cptr = new (addr) ::" << ctorCall << ";\n" - << "PySide::setNextQObjectMemoryAddr(0);" + << "PySide::setNextQObjectMemoryAddr(nullptr);" << '\n'; } uva << "} else {\n"; |