aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2023-02-27 08:57:33 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-02-27 13:03:20 +0000
commitd9091c4bef7ece6fe67f51b7b49a5ab515159320 (patch)
treea6a767182107b5300894c51727d5b43c4bdd8e0d
parent2f6fb73155a8a372eb5b6bb6ce496eaa330b696f (diff)
shiboken6: Fix module names of opaque containers
Include the package name. Fixes: PYSIDE-2239 Change-Id: I7277b94c780742000da71085a5e385f343b5c6f9 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit d43163af9c5630aeef67a2494e72009bc18077bb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/shiboken6/generator/shiboken/cppgenerator_container.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/sources/shiboken6/generator/shiboken/cppgenerator_container.cpp b/sources/shiboken6/generator/shiboken/cppgenerator_container.cpp
index dfa60c5c0..b4bc3f386 100644
--- a/sources/shiboken6/generator/shiboken/cppgenerator_container.cpp
+++ b/sources/shiboken6/generator/shiboken/cppgenerator_container.cpp
@@ -7,6 +7,7 @@
#include "ctypenames.h"
#include "containertypeentry.h"
#include "textstream.h"
+#include "typedatabase.h"
#include <QtCore/QDebug>
@@ -175,7 +176,8 @@ CppGenerator::OpaqueContainerData
// spec
const QString specName = result.name + u"_spec"_s;
- const QString name = moduleName() + u'.' + result.name;
+ const QString name = TypeDatabase::instance()->defaultPackageName()
+ + u'.' + result.name;
s << "static PyType_Spec " << specName << " = {\n" << indent
<< "\"" << name.count(u'.') << ':' << name << "\",\n"
<< "sizeof(ShibokenContainer),\n0,\nPy_TPFLAGS_DEFAULT,\n"