Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I27beffe4a6e2fc2f818960c3b9f5ffbfaac4a670

18 files changed, 398 insertions, 26 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index af10f1831..c8b9c173b 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -514,6 +514,8 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
     for (AbstractMetaClass *cls : qAsConst(m_metaClasses)) {
         if (!cls->isNamespace()) {
             setupInheritance(cls);
+            if (cls->templateBaseClass())
+                inheritTemplateFunctions(cls);
             if (!cls->hasVirtualDestructor() && cls->baseClass()
                 && cls->baseClass()->hasVirtualDestructor())
                 cls->setHasVirtualDestructor(true);
@@ -671,6 +673,7 @@ void AbstractMetaBuilderPrivate::traverseDom(const FileModelItem &dom)
     }
 
     m_itemToClass.clear();
+    m_typeSystemTypeDefs.clear();
 
     ReportHandler::endProgress();
 }
@@ -991,6 +994,23 @@ void AbstractMetaBuilderPrivate::traverseTypesystemTypedefs()
         *metaClass += AbstractMetaAttributes::Public;
         fillAddedFunctions(metaClass);
         addAbstractMetaClass(metaClass, nullptr);
+        // Ensure base classes are set up when traversing functions for the
+        // type to be resolved.
+        if (setupInheritance(metaClass)) {
+            // Create an entry to look up up types obtained from parsing
+            // functions in reverse. As opposed to container specializations,
+            // which are generated into every instantiating module (indicated
+            // by ContainerTypeEntry::targetLangPackage() being empty), the
+            // correct index array of the module needs to be found by reverse
+            // mapping the instantiations to the typedef entry.
+            // Synthesize a AbstractMetaType which would be found by an
+            // instantiation.
+            auto sourceType = new AbstractMetaType;
+            sourceType->setTypeEntry(metaClass->templateBaseClass()->typeEntry());
+            sourceType->setInstantiations(metaClass->templateBaseClassInstantiations());
+            sourceType->decideUsagePattern();
+            m_typeSystemTypeDefs.append({AbstractMetaTypeCPtr(sourceType), metaClass});
+        }
     }
 }
 
@@ -2098,6 +2118,20 @@ TypeEntries AbstractMetaBuilderPrivate::findTypeEntries(const QString &qualified
     return {};
 }
 
+// Reverse lookup of AbstractMetaType representing a template specialization
+// found during traversing function arguments to its type system typedef'ed
+// class.
+const AbstractMetaClass *AbstractMetaBuilderPrivate::resolveTypeSystemTypeDef(const AbstractMetaType *t) const
+{
+    if (t->hasInstantiations()) {
+        auto pred = [t](const TypeClassEntry &e) { return e.type->compare(*t); };
+        auto it = std::find_if(m_typeSystemTypeDefs.cbegin(), m_typeSystemTypeDefs.cend(), pred);
+        if (it != m_typeSystemTypeDefs.cend())
+            return it->klass;
+    }
+    return nullptr;
+}
+
 AbstractMetaType *AbstractMetaBuilderPrivate::translateType(const TypeInfo &_typei,
                                                             AbstractMetaClass *currentClass,
                                                             TranslateTypeFlags flags,
@@ -2333,6 +2367,15 @@ AbstractMetaType *AbstractMetaBuilderPrivate::translateTypeStatic(const TypeInfo
     // AbstractMetaType::cppSignature().
     metaType->decideUsagePattern();
 
+    if (d) {
+        // Reverse lookup of type system typedefs. Replace by class.
+        if (auto klass = d->resolveTypeSystemTypeDef(metaType.data())) {
+            metaType.reset(new AbstractMetaType);
+            metaType->setTypeEntry(klass->typeEntry());
+            metaType->decideUsagePattern();
+        }
+    }
+
     return metaType.take();
 }
 
@@ -2624,17 +2667,6 @@ bool AbstractMetaBuilderPrivate::inheritTemplate(AbstractMetaClass *subclass,
 {
     QVector<TypeInfo> targs = info.instantiations();
     AbstractMetaTypeList  templateTypes;
-    QString errorMessage;
-
-    if (subclass->isTypeDef()) {
-        subclass->setHasCloneOperator(templateClass->hasCloneOperator());
-        subclass->setHasEqualsOperator(templateClass->hasEqualsOperator());
-        subclass->setHasHashFunction(templateClass->hasHashFunction());
-        subclass->setHasNonPrivateConstructor(templateClass->hasNonPrivateConstructor());
-        subclass->setHasPrivateDestructor(templateClass->hasPrivateDestructor());
-        subclass->setHasProtectedDestructor(templateClass->hasProtectedDestructor());
-        subclass->setHasVirtualDestructor(templateClass->hasVirtualDestructor());
-    }
 
     for (const TypeInfo &i : qAsConst(targs)) {
         QString typeName = i.qualifiedName().join(colonColon());
@@ -2679,6 +2711,28 @@ bool AbstractMetaBuilderPrivate::inheritTemplate(AbstractMetaClass *subclass,
         }
     }
 
+    subclass->setTemplateBaseClass(templateClass);
+    subclass->setTemplateBaseClassInstantiations(templateTypes);
+    subclass->setBaseClass(templateClass->baseClass());
+    return true;
+}
+
+void AbstractMetaBuilderPrivate::inheritTemplateFunctions(AbstractMetaClass *subclass)
+{
+    QString errorMessage;
+    auto templateClass = subclass->templateBaseClass();
+
+    if (subclass->isTypeDef()) {
+        subclass->setHasCloneOperator(templateClass->hasCloneOperator());
+        subclass->setHasEqualsOperator(templateClass->hasEqualsOperator());
+        subclass->setHasHashFunction(templateClass->hasHashFunction());
+        subclass->setHasNonPrivateConstructor(templateClass->hasNonPrivateConstructor());
+        subclass->setHasPrivateDestructor(templateClass->hasPrivateDestructor());
+        subclass->setHasProtectedDestructor(templateClass->hasProtectedDestructor());
+        subclass->setHasVirtualDestructor(templateClass->hasVirtualDestructor());
+    }
+
+    const auto &templateTypes = subclass->templateBaseClassInstantiations();
     const AbstractMetaFunctionList &subclassFuncs = subclass->functions();
     const AbstractMetaFunctionList &templateClassFunctions = templateClass->functions();
     for (const AbstractMetaFunction *function : templateClassFunctions) {
@@ -2781,12 +2835,6 @@ bool AbstractMetaBuilderPrivate::inheritTemplate(AbstractMetaClass *subclass,
         f->replaceType(fieldType);
         subclass->addField(f.take());
     }
-
-    subclass->setTemplateBaseClass(templateClass);
-    subclass->setTemplateBaseClassInstantiations(templateTypes);
-    subclass->setBaseClass(templateClass->baseClass());
-
-    return true;
 }
 
 void AbstractMetaBuilderPrivate::parseQ_Properties(AbstractMetaClass *metaClass,
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index 671775130..846895089 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -44,6 +44,12 @@ class TypeDatabase;
 class AbstractMetaBuilderPrivate
 {
 public:
+    struct TypeClassEntry
+    {
+        AbstractMetaTypeCPtr type;
+        const AbstractMetaClass *klass;
+    };
+
     using TranslateTypeFlags = AbstractMetaBuilder::TranslateTypeFlags;
 
     Q_DISABLE_COPY(AbstractMetaBuilderPrivate)
@@ -162,6 +168,7 @@ public:
     bool inheritTemplate(AbstractMetaClass *subclass,
                          const AbstractMetaClass *templateClass,
                          const TypeInfo &info);
+    void inheritTemplateFunctions(AbstractMetaClass *subclass);
     AbstractMetaType *inheritTemplateType(const AbstractMetaTypeList &templateTypes,
                                           const AbstractMetaType *metaType);
 
@@ -174,6 +181,7 @@ public:
     void fixArgumentNames(AbstractMetaFunction *func, const FunctionModificationList &mods);
 
     void fillAddedFunctions(AbstractMetaClass *metaClass);
+    const AbstractMetaClass *resolveTypeSystemTypeDef(const AbstractMetaType *t) const;
 
     AbstractMetaBuilder *q;
     AbstractMetaClassList m_metaClasses;
@@ -200,6 +208,7 @@ public:
     QFileInfoList m_globalHeaders;
     QStringList m_headerPaths;
     mutable QHash<QString, Include> m_resolveIncludeHash;
+    QVector<TypeClassEntry> m_typeSystemTypeDefs; // look up metatype->class for type system typedefs
     bool m_skipDeprecated = false;
 };
 
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang_typedefs.h b/sources/shiboken2/ApiExtractor/abstractmetalang_typedefs.h
index 617ebcf4f..f8bca07c1 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetalang_typedefs.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetalang_typedefs.h
@@ -29,6 +29,7 @@
 #ifndef ABSTRACTMETALANG_TYPEDEFS_H
 #define ABSTRACTMETALANG_TYPEDEFS_H
 
+#include <QtCore/QSharedPointer>
 #include <QtCore/QVector>
 
 class AbstractMetaClass;
@@ -45,6 +46,7 @@ using AbstractMetaEnumList = QVector<AbstractMetaEnum *>;
 using AbstractMetaEnumValueList = QVector<AbstractMetaEnumValue *>;
 using AbstractMetaFieldList = QVector<AbstractMetaField *>;
 using AbstractMetaFunctionList = QVector<AbstractMetaFunction *>;
+using AbstractMetaTypeCPtr = QSharedPointer<const AbstractMetaType>;
 using AbstractMetaTypeList = QVector<AbstractMetaType *>;
 using AbstractMetaTypeCList = QVector<const AbstractMetaType *>;
 
diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index 7a93fcbe9..c64abf9fb 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -459,14 +459,6 @@ def init_PySide2_QtCore():
         "PyByteArray": bytearray,
         "PyBytes": bytes,
         "QDeadlineTimer(QDeadlineTimer.Forever)": Instance("PySide2.QtCore.QDeadlineTimer"),
-        "PySide2.QtCore.QCborStreamReader.StringResult[PySide2.QtCore.QByteArray]":
-            PySide2.QtCore.QCborStringResultByteArray,
-        "PySide2.QtCore.QCborStreamReader.StringResult[QString]":
-            PySide2.QtCore.QCborStringResultString,
-        "PySide2.QtCore.QCborStreamReader.QCborStringResultByteArray":
-            PySide2.QtCore.QCborStringResultByteArray,  # 5.14, why?
-        "PySide2.QtCore.QCborStreamReader.QCborStringResultString":
-            PySide2.QtCore.QCborStringResultString,  # 5.14, why?
         "PySide2.QtCore.QUrl.ComponentFormattingOptions":
             PySide2.QtCore.QUrl.ComponentFormattingOption, # mismatch option/enum, why???
         "PyUnicode": typing.Text,
diff --git a/sources/shiboken2/tests/libother/CMakeLists.txt b/sources/shiboken2/tests/libother/CMakeLists.txt
index d1e4c4354..c078d3546 100644
--- a/sources/shiboken2/tests/libother/CMakeLists.txt
+++ b/sources/shiboken2/tests/libother/CMakeLists.txt
@@ -6,6 +6,7 @@ otherderived.cpp
 otherobjecttype.cpp
 othermultiplederived.cpp
 smartptrtester.cpp
+othertypesystypedef.cpp
 )
 
 add_library(libother SHARED ${libother_SRC})
diff --git a/sources/shiboken2/tests/libother/othertypesystypedef.cpp b/sources/shiboken2/tests/libother/othertypesystypedef.cpp
new file mode 100644
index 000000000..7e6e1ff64
--- /dev/null
+++ b/sources/shiboken2/tests/libother/othertypesystypedef.cpp
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "othertypesystypedef.h"
+
+OtherValueWithUnitUser::OtherValueWithUnitUser() = default;
+
+
+ValueWithUnit<double, LengthUnit::Inch>
+    OtherValueWithUnitUser::doubleMillimeterToInch(ValueWithUnit<double, LengthUnit::Millimeter> v)
+{
+    return ValueWithUnit<double, LengthUnit::Inch>(v.value() / 254);
+}
+
+ValueWithUnit<int, LengthUnit::Inch>
+    OtherValueWithUnitUser::intMillimeterToInch(ValueWithUnit<int, LengthUnit::Millimeter> v)
+{
+    return ValueWithUnit<int, LengthUnit::Inch>(v.value() / 254);
+}
diff --git a/sources/shiboken2/tests/libother/othertypesystypedef.h b/sources/shiboken2/tests/libother/othertypesystypedef.h
new file mode 100644
index 000000000..e3f434613
--- /dev/null
+++ b/sources/shiboken2/tests/libother/othertypesystypedef.h
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef OTHERTYPESYSTYPEDEF_H
+#define OTHERTYPESYSTYPEDEF_H
+
+#include "libothermacros.h"
+
+#include <typesystypedef.h>
+
+class LIBOTHER_API OtherValueWithUnitUser
+{
+public:
+    OtherValueWithUnitUser();
+
+    static ValueWithUnit<double, LengthUnit::Inch> doubleMillimeterToInch(ValueWithUnit<double, LengthUnit::Millimeter>);
+
+    static ValueWithUnit<int, LengthUnit::Inch> intMillimeterToInch(ValueWithUnit<int, LengthUnit::Millimeter>);
+};
+
+#endif // OTHERTYPESYSTYPEDEF_H
diff --git a/sources/shiboken2/tests/libsample/CMakeLists.txt b/sources/shiboken2/tests/libsample/CMakeLists.txt
index 06021cec4..3bf119e9f 100644
--- a/sources/shiboken2/tests/libsample/CMakeLists.txt
+++ b/sources/shiboken2/tests/libsample/CMakeLists.txt
@@ -48,6 +48,7 @@ str.cpp
 strlist.cpp
 templateptr.cpp
 transform.cpp
+typesystypedef.cpp
 virtualmethods.cpp
 expression.cpp
 filter.cpp
diff --git a/sources/shiboken2/tests/libsample/typesystypedef.cpp b/sources/shiboken2/tests/libsample/typesystypedef.cpp
new file mode 100644
index 000000000..16777bf32
--- /dev/null
+++ b/sources/shiboken2/tests/libsample/typesystypedef.cpp
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "typesystypedef.h"
+
+ValueWithUnitUser::ValueWithUnitUser() = default;
+
+ValueWithUnit<double, LengthUnit::Millimeter>
+    ValueWithUnitUser::doubleInchToMillimeter(ValueWithUnit<double, LengthUnit::Inch> v)
+{
+    return ValueWithUnit<double, LengthUnit::Millimeter>(v.value() * 254);
+}
diff --git a/sources/shiboken2/tests/libsample/typesystypedef.h b/sources/shiboken2/tests/libsample/typesystypedef.h
new file mode 100644
index 000000000..228381c5f
--- /dev/null
+++ b/sources/shiboken2/tests/libsample/typesystypedef.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TYPESYSTYPEDEF_H
+#define TYPESYSTYPEDEF_H
+
+#include "libsamplemacros.h"
+
+enum class LengthUnit { Millimeter, Inch };
+
+template <class T, LengthUnit Unit>
+class ValueWithUnit
+{
+    public:
+    explicit ValueWithUnit(T value = {}) : m_value(value) {}
+
+    T value() const { return m_value; }
+    void setValue(const T &value) { m_value = value; }
+
+private:
+    T m_value;
+};
+
+class LIBSAMPLE_API ValueWithUnitUser
+{
+public:
+    ValueWithUnitUser();
+
+    static ValueWithUnit<double, LengthUnit::Millimeter> doubleInchToMillimeter(ValueWithUnit<double, LengthUnit::Inch>);
+};
+
+#endif // TYPESYSTYPEDEF_H
diff --git a/sources/shiboken2/tests/otherbinding/CMakeLists.txt b/sources/shiboken2/tests/otherbinding/CMakeLists.txt
index 05a282838..518e27396 100644
--- a/sources/shiboken2/tests/otherbinding/CMakeLists.txt
+++ b/sources/shiboken2/tests/otherbinding/CMakeLists.txt
@@ -10,9 +10,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/other/number_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/otherderived_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/othermultiplederived_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/otherobjecttype_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/other/othervaluewithunituser_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/sharedptr_str_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/smartptrtester_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/other/other_module_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/other/valuewithunitintinch_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/other/valuewithunitintmillimeter_wrapper.cpp
 )
 
 
diff --git a/sources/shiboken2/tests/otherbinding/global.h b/sources/shiboken2/tests/otherbinding/global.h
index 763566ae0..702fb9287 100644
--- a/sources/shiboken2/tests/otherbinding/global.h
+++ b/sources/shiboken2/tests/otherbinding/global.h
@@ -32,5 +32,5 @@
 #include "otherderived.h"
 #include "otherobjecttype.h"
 #include "othermultiplederived.h"
+#include "othertypesystypedef.h"
 #include "smartptrtester.h"
-
diff --git a/sources/shiboken2/tests/otherbinding/othertypesystypedef_test.py b/sources/shiboken2/tests/otherbinding/othertypesystypedef_test.py
new file mode 100644
index 000000000..aafeb4973
--- /dev/null
+++ b/sources/shiboken2/tests/otherbinding/othertypesystypedef_test.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Test case for a class that holds a void pointer.'''
+
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from shiboken_paths import init_paths
+init_paths()
+
+from other import (OtherValueWithUnitUser, ValueWithUnitIntInch,
+                   ValueWithUnitIntMillimeter)
+from sample import (ValueWithUnitDoubleMillimeter)
+
+
+class OtherTypeSysTypeDefTest(unittest.TestCase):
+    '''Test case type system typedefs across modules.'''
+
+    def test(self):
+        # Exercise existing typedefs from "sample"
+        mm_value = ValueWithUnitDoubleMillimeter(2540)
+        inch_value = OtherValueWithUnitUser.doubleMillimeterToInch(mm_value)
+        self.assertEqual(int(inch_value.value()), 10)
+        # Exercise typedefs in "other"
+        mm_value = ValueWithUnitIntMillimeter(2540)
+        inch_value = OtherValueWithUnitUser.intMillimeterToInch(mm_value)
+        self.assertEqual(inch_value.value(), 10)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/sources/shiboken2/tests/otherbinding/typesystem_other.xml b/sources/shiboken2/tests/otherbinding/typesystem_other.xml
index 78c4dd016..4081548fc 100644
--- a/sources/shiboken2/tests/otherbinding/typesystem_other.xml
+++ b/sources/shiboken2/tests/otherbinding/typesystem_other.xml
@@ -14,6 +14,10 @@
                         instantiations="Str"/>
     <value-type name="SmartPtrTester"/>
 
+    <typedef-type name="ValueWithUnitIntInch" source="ValueWithUnit&lt;int,LengthUnit::Inch&gt;"/>
+    <typedef-type name="ValueWithUnitIntMillimeter" source="ValueWithUnit&lt;int,LengthUnit::Millimeter&gt;"/>
+    <value-type name="OtherValueWithUnitUser"/>
+
     <suppress-warning text="signature 'operator!=(ByteArray,const char*)' for function modification in 'ByteArray' not found." />
     <suppress-warning text="signature 'operator+(ByteArray,const char*)' for function modification in 'ByteArray' not found." />
     <suppress-warning text="signature 'operator==(ByteArray,const char*)' for function modification in 'ByteArray' not found." />
diff --git a/sources/shiboken2/tests/samplebinding/CMakeLists.txt b/sources/shiboken2/tests/samplebinding/CMakeLists.txt
index 6bbfdb5bc..5e4478582 100644
--- a/sources/shiboken2/tests/samplebinding/CMakeLists.txt
+++ b/sources/shiboken2/tests/samplebinding/CMakeLists.txt
@@ -117,6 +117,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/strlist_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/time_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/templateptr_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/unremovednamespace_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/valuewithunitdoubleinch_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/valuewithunitdoublemillimeter_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/valuewithunituser_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualdaughter_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualdaughter2_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/virtualfinaldaughter_wrapper.cpp
diff --git a/sources/shiboken2/tests/samplebinding/global.h b/sources/shiboken2/tests/samplebinding/global.h
index f4e20b74f..0a168099b 100644
--- a/sources/shiboken2/tests/samplebinding/global.h
+++ b/sources/shiboken2/tests/samplebinding/global.h
@@ -86,6 +86,7 @@
 #include "sometime.h"
 #include "templateptr.h"
 #include "transform.h"
+#include "typesystypedef.h"
 #include "virtualmethods.h"
 #include "voidholder.h"
 #include "valueandvirtual.h"
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
index 6a52dae7a..d0ccbb349 100644
--- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
+++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml
@@ -2444,6 +2444,12 @@
     <value-type name="ToBeRenamedValue" target-lang-name="RenamedValue"/>
     <value-type name="RenamedUser"/>
 
+    <enum-type name="LengthUnit"/>
+    <value-type name="ValueWithUnit" generate="no"/>
+    <typedef-type name="ValueWithUnitDoubleInch" source="ValueWithUnit&lt;double,LengthUnit::Inch&gt;"/>
+    <typedef-type name="ValueWithUnitDoubleMillimeter" source="ValueWithUnit&lt;double,LengthUnit::Millimeter&gt;"/>
+    <value-type name="ValueWithUnitUser"/>
+
     <suppress-warning text="horribly broken type '__off64_t'" />
     <suppress-warning text="enum '__codecvt_result' does not have a type entry or is not an enum" />
     <suppress-warning text="Pure virtual method &quot;Abstract::hideFunction(HideType*)&quot; must be implement but was completely removed on typesystem." />
diff --git a/sources/shiboken2/tests/samplebinding/typesystypedef_test.py b/sources/shiboken2/tests/samplebinding/typesystypedef_test.py
new file mode 100644
index 000000000..30ac1c900
--- /dev/null
+++ b/sources/shiboken2/tests/samplebinding/typesystypedef_test.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of Qt for Python.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Test case for a class that holds a void pointer.'''
+
+import os
+import sys
+import unittest
+
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+from shiboken_paths import init_paths
+init_paths()
+
+from sample import (ValueWithUnitUser, ValueWithUnitDoubleInch,
+                    ValueWithUnitDoubleMillimeter)
+
+
+class TypeSysTypeDefTest(unittest.TestCase):
+    '''Test case type system typedefs.'''
+
+    def test(self):
+        inch_value = ValueWithUnitDoubleInch(10)
+        mm_value = ValueWithUnitUser.doubleInchToMillimeter(inch_value)
+        self.assertEqual(int(mm_value.value()), 2540)
+
+
+if __name__ == '__main__':
+    unittest.main()