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

Change-Id: I98ef98ca603a1d82f944973a06375e65192fdab2

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
index c252bba001..a456facd2f 100644
--- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
+++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
@@ -89,6 +89,7 @@ private slots:
     void customValueType();
     void customValueTypeInQml();
     void gadgetInheritance();
+    void gadgetTemplateInheritance();
     void toStringConversion();
     void enumerableProperties();
     void enumProperties();
@@ -1613,6 +1614,19 @@ public:
     Q_INVOKABLE void functionInDerivedGadget(int value) { m_derivedProperty = value; }
 };
 
+// QTBUG-66744: we want a Q_GADGET giving us generic type safety in C++ and property access in Qml
+template <typename T>
+struct DerivedTypedGadget : public BaseGadget
+{
+    // cannot use Q_GADGET here
+public:
+    DerivedTypedGadget() {}
+};
+
+class DerivedTypedGadgetDummyType {};
+
+Q_DECLARE_METATYPE(DerivedTypedGadget<DerivedTypedGadgetDummyType>)
+
 class TypeWithCustomValueType : public QObject
 {
     Q_OBJECT
@@ -1657,6 +1671,21 @@ void tst_qqmlvaluetypes::gadgetInheritance()
     QCOMPARE(value.property("baseProperty").toInt(), 42);
 }
 
+void tst_qqmlvaluetypes::gadgetTemplateInheritance()
+{
+    QJSEngine engine;
+
+    QJSValue value = engine.toScriptValue(DerivedTypedGadget<DerivedTypedGadgetDummyType>());
+
+    QCOMPARE(value.property("baseProperty").toInt(), 0);
+    value.setProperty("baseProperty", 10);
+    QCOMPARE(value.property("baseProperty").toInt(), 10);
+
+    QJSValue method = value.property("functionInBaseGadget");
+    method.call(QJSValueList() << QJSValue(42));
+    QCOMPARE(value.property("baseProperty").toInt(), 42);
+}
+
 struct StringLessGadget {
     Q_GADGET
 };