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

Qt For Python Release 5.15.4

Change-Id: I8457501ba90fc481fb9de686eb8a2f880ecc06cd

1 files changed, 5 insertions, 2 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 05f9cf203..d7ae45ae3 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -3088,8 +3088,11 @@ AbstractMetaClassList AbstractMetaBuilderPrivate::classesTopologicalSorted(const
         // Member fields need to be initialized
         const AbstractMetaFieldList &fields = clazz->fields();
         for (AbstractMetaField *field : fields) {
-            addClassDependency(field->type()->typeEntry(), clazz, classIndex,
-                               map, &graph);
+            auto typeEntry = field->type()->typeEntry();
+            if (typeEntry->isEnum()) // Enum defined in class?
+                typeEntry = typeEntry->parent();
+            if (typeEntry != nullptr)
+                addClassDependency(typeEntry, clazz, classIndex, map, &graph);
         }
     }