1 files changed, 18 insertions, 0 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 3f76739f3..a200a87d1 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -514,6 +514,8 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
             addAbstractMetaClass(cls);
     }
 
+    traverseTypesystemTypedefs();
+
     for (const ClassModelItem &item : typeValues)
         traverseClassMembers(item);
 
@@ -1039,6 +1041,22 @@ AbstractMetaClass* AbstractMetaBuilderPrivate::traverseTypeDef(const FileModelIt
     return metaClass;
 }
 
+// Add the typedef'ed classes
+void AbstractMetaBuilderPrivate::traverseTypesystemTypedefs()
+{
+    const auto &entries = TypeDatabase::instance()->typedefEntries();
+    for (auto it = entries.begin(), end = entries.end(); it != end; ++it) {
+        TypedefEntry *te = it.value();
+        AbstractMetaClass *metaClass = new AbstractMetaClass;
+        metaClass->setTypeDef(true);
+        metaClass->setTypeEntry(te->target());
+        metaClass->setBaseClassNames(QStringList(te->sourceType()));
+        *metaClass += AbstractMetaAttributes::Public;
+        fillAddedFunctions(metaClass);
+        addAbstractMetaClass(metaClass);
+    }
+}
+
 AbstractMetaClass *AbstractMetaBuilderPrivate::traverseClass(const FileModelItem &dom,
                                                              const ClassModelItem &classItem)
 {