@@ -242,18 +242,27 @@ Item {
242242 tryCompare(scopesModel.get(2), "isActive", data.active2);
243243 }
244244
245− function test_hswipe_disabled_vswipe() {
245+ function checkFlickMovingAndNotInteractive()
246+ {
246247 var dashContentList = findChild(dashContent, "dashContentList");
247248
248− tryCompare(dashContentList, "interactive", true);
249+ if (dashContentList.currentItem.moving && !dashContentList.interactive)
250+ return true;
249251
250252 var startX = dashContentList.width/2;
251253 var startY = dashContentList.height/2;
252− touchFlick(dashContentList, startX, startY, startX, startY - units.gu(80));
254+ touchFlick(dashContentList, startX, startY, startX, startY - units.gu(40));
255+
256+ return dashContentList.currentItem.moving && !dashContentList.interactive;
257+ }
258+
253259
254− tryCompare(dashContentList.currentItem, "moving", true);
260+ function test_hswipe_disabled_vswipe() {
261+ var dashContentList = findChild(dashContent, "dashContentList");
262+
263+ tryCompare(dashContentList, "interactive", true);
255264
256− compare(dashContentList.interactive, false);
265+ tryCompareFunction(checkFlickMovingAndNotInteractive, true);
257266 }
258267 }
259268}