aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt1
-rw-r--r--tests/auto/qml/qqmllanguage/data/badListItemType.qml5
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp8
3 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt b/tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt
new file mode 100644
index 0000000000..76809dc9a1
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/badListItemType.errors.txt
@@ -0,0 +1 @@
+4:15:Cannot assign object to list
diff --git a/tests/auto/qml/qqmllanguage/data/badListItemType.qml b/tests/auto/qml/qqmllanguage/data/badListItemType.qml
new file mode 100644
index 0000000000..d612bb47b9
--- /dev/null
+++ b/tests/auto/qml/qqmllanguage/data/badListItemType.qml
@@ -0,0 +1,5 @@
+import QtQuick 2.0
+
+Item {
+ children: Component { Item {} } // QTBUG-41848
+}
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index d6d2911285..ec3e38dd14 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -118,6 +118,7 @@ private slots:
void dynamicProperties();
void dynamicPropertiesNested();
void listProperties();
+ void badListItemType();
void dynamicObjectProperties();
void dynamicSignalsAndSlots();
void simpleBindings();
@@ -1332,6 +1333,13 @@ void tst_qqmllanguage::listProperties()
QCOMPARE(object->property("test").toInt(), 2);
}
+void tst_qqmllanguage::badListItemType()
+{
+ QQmlComponent component(&engine, testFileUrl("badListItemType.qml"));
+ QVERIFY(component.isError());
+ VERIFY_ERRORS("badListItemType.errors.txt");
+}
+
// Tests the creation and assignment of dynamic object properties
// ### Not complete
void tst_qqmllanguage::dynamicObjectProperties()