1 files changed, 45 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 15f19d550b..f09c130e38 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -178,6 +178,7 @@ private slots:
     void importIncorrectCase();
     void importJs_data();
     void importJs();
+    void explicitSelfImport();
 
     void qmlAttachedPropertiesObjectMethod();
     void customOnProperty();
@@ -209,6 +210,7 @@ private slots:
     void lowercaseEnumCompileTime_data();
     void lowercaseEnumCompileTime();
     void scopedEnum();
+    void qmlEnums();
     void literals_data();
     void literals();
 
@@ -545,6 +547,12 @@ void tst_qqmllanguage::errors_data()
     QTest::newRow("singularProperty.2") << "singularProperty.2.qml" << "singularProperty.2.errors.txt" << false;
 
     QTest::newRow("scopedEnumList") << "scopedEnumList.qml" << "scopedEnumList.errors.txt" << false;
+    QTest::newRow("lowercase enum value") << "lowercaseQmlEnum.1.qml" << "lowercaseQmlEnum.1.errors.txt" << false;
+    QTest::newRow("lowercase enum type") << "lowercaseQmlEnum.2.qml" << "lowercaseQmlEnum.2.errors.txt" << false;
+    QTest::newRow("string enum value") << "invalidQmlEnumValue.1.qml" << "invalidQmlEnumValue.1.errors.txt" << false;
+    QTest::newRow("identifier enum type") << "invalidQmlEnumValue.2.qml" << "invalidQmlEnumValue.2.errors.txt" << false;
+    QTest::newRow("enum value too large") << "invalidQmlEnumValue.3.qml" << "invalidQmlEnumValue.3.errors.txt" << false;
+    QTest::newRow("non-integer enum value") << "invalidQmlEnumValue.4.qml" << "invalidQmlEnumValue.4.errors.txt" << false;
 
     const QString expectedError = isCaseSensitiveFileSystem(dataDirectory()) ?
         QStringLiteral("incorrectCase.errors.sensitive.txt") :
@@ -3067,6 +3075,16 @@ void tst_qqmllanguage::importJs()
     engine.setImportPathList(defaultImportPathList);
 }
 
+void tst_qqmllanguage::explicitSelfImport()
+{
+    engine.setImportPathList(QStringList(defaultImportPathList) << testFile("lib"));
+
+    QQmlComponent component(&engine, testFileUrl("mixedModuleWithSelfImport.qml"));
+    QVERIFY(component.errors().count() == 0);
+
+    engine.setImportPathList(defaultImportPathList);
+}
+
 void tst_qqmllanguage::qmlAttachedPropertiesObjectMethod()
 {
     QObject object;
@@ -3707,6 +3725,33 @@ void tst_qqmllanguage::scopedEnum()
     QCOMPARE(o->property("noScope").toInt(), (int)MyTypeObject::MyScopedEnum::ScopedVal2);
 }
 
+void tst_qqmllanguage::qmlEnums()
+{
+    {
+        QQmlComponent component(&engine, testFileUrl("TypeWithEnum.qml"));
+        QObject *o = component.create();
+        QVERIFY(o);
+        QCOMPARE(o->property("enumValue").toInt(), 1);
+        QCOMPARE(o->property("enumValue2").toInt(), 2);
+        QCOMPARE(o->property("scopedEnumValue").toInt(), 1);
+
+        QCOMPARE(o->property("otherEnumValue1").toInt(), 24);
+        QCOMPARE(o->property("otherEnumValue2").toInt(), 25);
+        QCOMPARE(o->property("otherEnumValue3").toInt(), 24);
+        QCOMPARE(o->property("otherEnumValue4").toInt(), 25);
+        QCOMPARE(o->property("otherEnumValue5").toInt(), 1);
+    }
+
+    {
+        QQmlComponent component(&engine, testFileUrl("usingTypeWithEnum.qml"));
+        QObject *o = component.create();
+        QVERIFY(o);
+        QCOMPARE(o->property("enumValue").toInt(), 1);
+        QCOMPARE(o->property("enumValue2").toInt(), 0);
+        QCOMPARE(o->property("scopedEnumValue").toInt(), 2);
+    }
+}
+
 void tst_qqmllanguage::literals_data()
 {
     QTest::addColumn<QString>("property");