Merge remote-tracking branch 'origin/5.13' into 5.14

Change-Id: I73d9e896c05f7d944f3092b51a3a95c7e6e284b8

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlpromise/data/promisehandlerthrows.qml b/tests/auto/qml/qqmlpromise/data/promisehandlerthrows.qml
new file mode 100644
index 0000000000..d23ea43e74
--- /dev/null
+++ b/tests/auto/qml/qqmlpromise/data/promisehandlerthrows.qml
@@ -0,0 +1,17 @@
+import QtQuick 2.12
+
+Item {
+    id: root
+    property string errorMessage
+    Component.onCompleted: () => {
+    let prom = Promise.reject("Some error")
+        .then(
+                o => {console.log("Never reached");},
+                err => {
+                    console.log("Rethrowing err");
+                    throw err;
+                }
+             )
+        .catch(err => root.errorMessage = err)
+    }
+}