From 59de6f6e6ed1d556d3f2d1bd9804fd237484d840 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 26 Nov 2021 16:54:26 +0100
Subject: 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>
---
 sources/shiboken6/generator/shiboken/cppgenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sources/shiboken6/generator/shiboken/cppgenerator.cpp')

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";
-- 
cgit v1.2.3