From d2d0e397309a1b18eaff9ddee0940007f0e1c4bf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 6 Jun 2019 13:41:12 +0200 Subject: shiboken: Disambiguate indexes of smart pointer types Add the module name like it is done for namespaces and containers. Task-number: PYSIDE-1024 Change-Id: Iba8589bfe360763bc186e5129d0ba480b2fb58ae Reviewed-by: Qt CI Bot Reviewed-by: Cristian Maureira-Fredes --- sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sources/shiboken2') diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index 2b3b20c75..5d599fe95 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -2681,8 +2681,11 @@ QString ShibokenGenerator::getTypeIndexVariableName(const TypeEntry* type) QString ShibokenGenerator::getTypeIndexVariableName(const AbstractMetaType* type) { QString result = QLatin1String("SBK"); - if (type->typeEntry()->isContainer()) + const auto *typeEntry = type->typeEntry(); + if (typeEntry->isContainer() + || typeEntry->isSmartPointer()) { // PYSIDE-1024 result += QLatin1Char('_') + moduleName().toUpper(); + } result += processInstantiationsVariableName(type); appendIndexSuffix(&result); return result; -- cgit v1.2.3