3 files changed, 29 insertions, 8 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index 4105b4378..2e06a5346 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -1327,14 +1327,8 @@ void AbstractMetaBuilderPrivate::fixReturnTypeOfConversionOperator(AbstractMetaF
 
 static bool _compareAbstractMetaTypes(const AbstractMetaType* type, const AbstractMetaType* other)
 {
-    if (!type && !other)
-        return true;
-    if (!type || !other)
-        return false;
-    return type->typeEntry() == other->typeEntry()
-            && type->isConstant() == other->isConstant()
-            && type->referenceType() == other->referenceType()
-            && type->indirections() == other->indirections();
+    return (type != nullptr) == (other != nullptr)
+        && (type == nullptr || *type == *other);
 }
 
 static bool _compareAbstractMetaFunctions(const AbstractMetaFunction* func, const AbstractMetaFunction* other)
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
index 634eae5a0..50ee849a2 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp
@@ -281,6 +281,26 @@ bool AbstractMetaType::hasTemplateChildren() const
     return false;
 }
 
+bool AbstractMetaType::equals(const AbstractMetaType &rhs) const
+{
+    if (m_typeEntry != rhs.m_typeEntry || m_constant != rhs.m_constant
+        || m_referenceType != rhs.m_referenceType
+        || m_indirections != rhs.m_indirections
+        || m_instantiations.size() != rhs.m_instantiations.size()
+        || m_arrayElementCount != rhs.m_arrayElementCount) {
+        return false;
+    }
+    if ((m_arrayElementType != nullptr) != (rhs.m_arrayElementType != nullptr)
+        || (m_arrayElementType != nullptr && !m_arrayElementType->equals(*rhs.m_arrayElementType))) {
+        return false;
+    }
+    for (int i = 0, size = m_instantiations.size(); i < size; ++i) {
+        if (!m_instantiations.at(i)->equals(*rhs.m_instantiations.at(i)))
+                return false;
+    }
+    return true;
+}
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug d, const AbstractMetaType *at)
 {
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h
index 7b4ad2b21..de00ca486 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h
@@ -536,6 +536,8 @@ public:
 
     bool hasTemplateChildren() const;
 
+    bool equals(const AbstractMetaType &rhs) const;
+
 private:
     TypeUsagePattern determineUsagePattern() const;
     QString formatSignature(bool minimal) const;
@@ -564,6 +566,11 @@ private:
     Q_DISABLE_COPY(AbstractMetaType)
 };
 
+inline bool operator==(const AbstractMetaType &t1, const AbstractMetaType &t2)
+{ return t1.equals(t2); }
+inline bool operator!=(const AbstractMetaType &t1, const AbstractMetaType &t2)
+{ return !t1.equals(t2); }
+
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug d, const AbstractMetaType *at);
 #endif