@@ -143,6 +143,8 @@ Item {
143 function waitForPage(name) {
143 function waitForPage(name) {
144 var pages = findChild(wizard, "wizardPages");
144 var pages = findChild(wizard, "wizardPages");
145 var stack = findChild(pages, "pageStack");
145 var stack = findChild(pages, "pageStack");
146+ var contentAnimation = findInvisibleChild(stack.currentPage, "contentAnimation");
147+ tryCompareFunction(function() { return contentAnimation.running; }, false);
146 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
148 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
147 tryCompareFunction(function() { return stack.currentPage.objectName; }, name, 15000);
149 tryCompareFunction(function() { return stack.currentPage.objectName; }, name, 15000);
148 tryCompare(stack.currentPage, "opacity", 1.0);
150 tryCompare(stack.currentPage, "opacity", 1.0);
@@ -185,8 +187,6 @@ Item {
187 page = waitForPage("tzPage");
189 page = waitForPage("tzPage");
188− var contentAnimation = findInvisibleChild(page, "contentAnimation");
189− tryCompareFunction(function() { return contentAnimation.running; }, false);
190 if (name === page.objectName) return page;
190 if (name === page.objectName) return page;
191 waitUntilTransitionsEnd(page);
191 waitUntilTransitionsEnd(page);
192 var tzList = findChild(page, "tzList");
192 var tzList = findChild(page, "tzList");