diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-05 18:36:06 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-05 18:36:06 +0100 |
| commit | da5b3470a0ce57f8441485c7b146cdb3c1d2f331 (patch) | |
| tree | 030a47ff04145b05eb8160575243a73230dc24a0 /sources/shiboken2/generator/shiboken2/cppgenerator.cpp | |
| parent | d0fbcc90bd02090f921313dafecba20065fb2eb5 (diff) | |
| parent | 37a1e27d49a6a1f7e45621e93a0f13a63fb20d9e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I779defc33a4bab15cfde1e276d6d78c476a47e0f
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/cppgenerator.cpp')
| -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 db05b21d6..fb84b7d23 100644 --- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp +++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -3871,7 +3871,7 @@ void CppGenerator::writeClassDefinition(QTextStream &s, if (metaClass->isNamespace() || metaClass->hasPrivateDestructor()) { tp_dealloc = metaClass->hasPrivateDestructor() ? QLatin1String("SbkDeallocWrapperWithPrivateDtor") : - QLatin1String("object_dealloc /* PYSIDE-832: Prevent replacement of \"0\" with subtype_dealloc. */"); + QLatin1String("Sbk_object_dealloc /* PYSIDE-832: Prevent replacement of \"0\" with subtype_dealloc. */"); tp_init.clear(); } else { QString deallocClassName; |