diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-29 14:10:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-10-29 14:15:29 +0100 |
| commit | d15a65c93717b8e69352a19dd81c3b08adcef996 (patch) | |
| tree | ec8feeb40061b7ddf4f40e38cece9fe67e4957ec /sources/shiboken2/generator | |
| parent | f4a6d74852b0ba6711195a9c3fc9356e677a3409 (diff) | |
| parent | 6978325323208c395d135f19847a8ad0b13f93f9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I3bb491686968e81382c135ab737da259d9796f52
Diffstat (limited to 'sources/shiboken2/generator')
| -rw-r--r-- | sources/shiboken2/generator/shiboken2/cppgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp index 29f28a1a7..99947d347 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -3801,7 +3801,7 @@ void CppGenerator::writeClassDefinition(QTextStream &s, if (metaClass->isNamespace() || metaClass->hasPrivateDestructor()) { tp_dealloc = metaClass->hasPrivateDestructor() ? QLatin1String("SbkDeallocWrapperWithPrivateDtor") : - QLatin1String("SbkDummyDealloc /* PYSIDE-595: Prevent replacement of \"0\" with subtype_dealloc. */"); + QLatin1String("object_dealloc /* PYSIDE-832: Prevent replacement of \"0\" with subtype_dealloc. */"); tp_init = QLatin1String("0"); } else { QString deallocClassName; |