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

Change-Id: If4d8a25f5a2192a658d031252435935cbc675725

1 files changed, 6 insertions, 12 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml
index 117141935..4e74af733 100644
--- a/tests/auto/quick/qmltests/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml
@@ -68,10 +68,8 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("test1.html"))
 
             keyPress(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            wait(100) // The ui delegate is invoked asynchronously
-            verify(FilePickerParams.filePickerOpened)
-            titleSpy.wait()
-            compare(webEngineView.title, "test1.html")
+            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(webEngineView, "title", "test1.html")
         }
 
         function test_acceptMultipleFilesSelection() {
@@ -83,10 +81,8 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("test2.html"))
 
             keyPress(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            wait(100)
-            verify(FilePickerParams.filePickerOpened)
-            titleSpy.wait()
-            compare(webEngineView.title, "test1.html,test2.html")
+            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(webEngineView, "title", "test1.html,test2.html")
         }
 
         function test_acceptDirectory() {
@@ -97,10 +93,8 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("../data"))
 
             keyPress(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            wait(100) // The ui delegate is invoked asynchronously
-            verify(FilePickerParams.filePickerOpened)
-            titleSpy.wait()
-            compare(webEngineView.title, "data")
+            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(webEngineView, "title", "data")
         }
 
         function test_reject() {