5 files changed, 33 insertions, 0 deletions
diff --git a/tests/auto/declarative/listview/data/listview.qml b/tests/auto/declarative/listview/data/listview.qml
index 5083329..9039b55 100644
--- a/tests/auto/declarative/listview/data/listview.qml
+++ b/tests/auto/declarative/listview/data/listview.qml
@@ -31,6 +31,7 @@ Rectangle {
                     x: 200
                     text: wrapper.y
                 }
+                color: ListView.isCurrentItem ? "lightsteelblue" : "white"
             }
         }
     ]
diff --git a/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml b/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
new file mode 100644
index 0000000..398489a
--- /dev/null
+++ b/tests/auto/declarative/qmlecmascript/data/shutdownErrors.qml
@@ -0,0 +1,13 @@
+import Qt 4.6
+
+Item {
+    property int test: myObject.object.a
+
+    Item {
+        id: myObject
+        property Object object;
+        object: Object {
+            property int a: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlecmascript/testtypes.h b/tests/auto/declarative/qmlecmascript/testtypes.h
index 88616096..d566681 100644
--- a/tests/auto/declarative/qmlecmascript/testtypes.h
+++ b/tests/auto/declarative/qmlecmascript/testtypes.h
@@ -135,6 +135,7 @@ private:
     QList<QObject *> m_objectQList;
 };
 
+QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
 QML_DECLARE_TYPE(MyQmlObject);
 
 class MyQmlContainer : public QObject
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
index a788109..3e98c69 100644
--- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
+++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
@@ -107,6 +107,7 @@ private slots:
     void listProperties();
     void exceptionClearsOnReeval();
     void transientErrors();
+    void shutdownErrors();
 
 private:
     QmlEngine engine;
@@ -910,6 +911,22 @@ void tst_qmlecmascript::transientErrors()
     QCOMPARE(transientErrorsMsgCount, 0);
 }
 
+// Check that errors during shutdown are minimized
+void tst_qmlecmascript::shutdownErrors()
+{
+    QmlComponent component(&engine, TEST_FILE("shutdownErrors.qml"));
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    transientErrorsMsgCount = 0;
+    QtMsgHandler old = qInstallMsgHandler(transientErrorsMsgHandler);
+
+    delete object;
+
+    qInstallMsgHandler(old);
+    QCOMPARE(transientErrorsMsgCount, 0);
+}
+
 QTEST_MAIN(tst_qmlecmascript)
 
 #include "tst_qmlecmascript.moc"
diff --git a/tests/auto/declarative/qmllanguage/testtypes.h b/tests/auto/declarative/qmllanguage/testtypes.h
index ace86f0..91c6e2e 100644
--- a/tests/auto/declarative/qmllanguage/testtypes.h
+++ b/tests/auto/declarative/qmllanguage/testtypes.h
@@ -151,6 +151,7 @@ private:
     MyQmlObject *m_qmlobject;
     MyCustomVariantType m_custom;
 };
+QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
 QML_DECLARE_TYPE(MyQmlObject);
 
 class MyGroupedObject : public QObject