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

Conflicts:
	.qmake.conf

Change-Id: Iab80dd0c2bea54171971fd7a9538000908ed90d5

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/controls/data/tst_calendar.qml b/tests/auto/controls/data/tst_calendar.qml
index 3622268b..1185aca9 100644
--- a/tests/auto/controls/data/tst_calendar.qml
+++ b/tests/auto/controls/data/tst_calendar.qml
@@ -939,14 +939,17 @@ Item {
             asyncCalendar.parent = container;
             waitForRendering(asyncCalendar);
 
+            tryCompare(testcase.aysncDelegatesConstructed, "length", CalendarUtils.daysInAWeek);
+
             for (var i = 0; i < testcase.aysncDelegatesConstructed.length; ++i) {
-                tryCompare(testcase.aysncDelegatesConstructed, i, true);
+                compare(testcase.aysncDelegatesConstructed[i], true);
             }
 
             asyncCalendarLoader.active = false;
+            tryCompare(testcase.aysncDelegatesDestructed, "length", CalendarUtils.daysInAWeek);
 
             for (i = 0; i < testcase.aysncDelegatesDestructed.length; ++i) {
-                tryCompare(testcase.aysncDelegatesDestructed, i, true);
+                compare(testcase.aysncDelegatesDestructed[i], true);
             }
         }
     }