diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-13 15:51:23 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-13 16:24:03 +0200 |
| commit | b1402395381198539d23e65a6595a156ad395b24 (patch) | |
| tree | f67efcb76dd2dff8a8b2538524a9e2c1ab1d3a13 /sources/shiboken2 | |
| parent | d21b58ef69559f4a0412f5129175b31e4450d55b (diff) | |
Revert "shiboken: Disambiguate indexes of smart pointer types"
This is not the proper fix for the issue. The index of the declaring
module needs to be used for this to work.
This reverts commit d2d0e397309a1b18eaff9ddee0940007f0e1c4bf.
Task-number: PYSIDE-1024
Change-Id: Idc0e859ebda1626b5e841aa96be54317a5f3d0d0
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/shibokengenerator.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp index 5d599fe95..2b3b20c75 100644 --- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp @@ -2681,11 +2681,8 @@ QString ShibokenGenerator::getTypeIndexVariableName(const TypeEntry* type) QString ShibokenGenerator::getTypeIndexVariableName(const AbstractMetaType* type) { QString result = QLatin1String("SBK"); - const auto *typeEntry = type->typeEntry(); - if (typeEntry->isContainer() - || typeEntry->isSmartPointer()) { // PYSIDE-1024 + if (type->typeEntry()->isContainer()) result += QLatin1Char('_') + moduleName().toUpper(); - } result += processInstantiationsVariableName(type); appendIndexSuffix(&result); return result; |