1 files changed, 37 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index ecf87c51d6..e2032c3b86 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -132,6 +132,7 @@ private slots:
     void autoComponentCreation();
     void autoComponentCreationInGroupProperty();
     void propertyValueSource();
+    void requiredProperty();
     void attachedProperties();
     void dynamicObjects();
     void customVariantTypes();
@@ -303,6 +304,8 @@ private slots:
 
     void typeWrapperToVariant();
 
+    void extendedForeignTypes();
+
 private:
     QQmlEngine engine;
     QStringList defaultImportPathList;
@@ -1633,6 +1636,25 @@ void tst_qqmllanguage::propertyValueSource()
     }
 }
 
+void tst_qqmllanguage::requiredProperty()
+{
+    QQmlEngine engine;
+    {
+        QQmlComponent component(&engine, testFileUrl("requiredProperties.1.qml"));
+        VERIFY_ERRORS(0);
+        QScopedPointer<QObject> object(component.create());
+        QVERIFY(object);
+    }
+    {
+        QQmlComponent component(&engine, testFileUrl("requiredProperties.2.qml"));
+        QVERIFY(!component.errors().empty());
+    }
+    {
+        QQmlComponent component(&engine, testFileUrl("requiredProperties.3.qml"));
+        QVERIFY(!component.errors().empty());
+    }
+}
+
 void tst_qqmllanguage::attachedProperties()
 {
     QQmlComponent component(&engine, testFileUrl("attachedProperties.qml"));
@@ -5237,6 +5259,21 @@ void tst_qqmllanguage::typeWrapperToVariant()
     QVERIFY(target);
 }
 
+void tst_qqmllanguage::extendedForeignTypes()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("foreignExtended.qml"));
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> o(component.create());
+    QVERIFY(!o.isNull());
+
+    QCOMPARE(o->property("extendedBase").toInt(), 43);
+    QCOMPARE(o->property("extendedExtension").toInt(), 42);
+    QCOMPARE(o->property("foreignExtendedExtension").toInt(), 42);
+    QCOMPARE(o->property("foreignObjectName").toString(), QLatin1String("foreign"));
+    QCOMPARE(o->property("foreignExtendedObjectName").toString(), QLatin1String("foreignExtended"));
+}
+
 QTEST_MAIN(tst_qqmllanguage)
 
 #include "tst_qqmllanguage.moc"