Merge tag 'v5.15.10-lts' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl

Qt For Python Release 5.15.10

Change-Id: Ie11dd2ac7278359128c19174cb4becd1cb5edbbe

1 files changed, 2 insertions, 2 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 1ebe38fbc..670427d3f 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -1770,7 +1770,7 @@ void CppGenerator::writeSmartPointerConverterFunctions(QTextStream &s, const Abs
         // TODO: Missing conversion to smart pointer pointer type:
 
         s << "// Register smartpointer conversion for all derived classes\n";
-        const auto classes = getBaseClasses(targetClass);
+        const auto classes = getAllAncestors(targetClass);
         for (auto k : classes) {
             if (smartPointerTypeEntry->matchesInstantiation(k->typeEntry())) {
                 if (auto smartTargetType = findSmartPointerInstantiation(k->typeEntry())) {
@@ -4016,7 +4016,7 @@ void CppGenerator::writeSmartPointerConverterInitialization(QTextStream &s, cons
     if (!klass)
         return;
 
-    const auto classes = getBaseClasses(klass);
+    const auto classes = getAllAncestors(klass);
     if (classes.isEmpty())
         return;