Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I5ae6ebe2ed09fc9c22833a8f8da929257c18714e

1 files changed, 15 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index d5ee3e52..086d9ad4 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -181,4 +181,19 @@ TestCase {
 
         control.destroy()
     }
+
+    function test_indeterminate() {
+        skip("skipping until https://codereview.qt-project.org/#/c/145140/ is merged")
+        var control = progressBar.createObject(testCase)
+        verify(control)
+        compare(control.indeterminate, false)
+
+        wait(100)
+        control.indeterminate = true
+        wait(100)
+        // Shouldn't crash...
+        control.indeterminate = false
+
+        control.destroy()
+    }
 }