@@ -124,16 +124,12 @@ Rectangle {
124124 zoomable:false,
125125 answer1: true,
126126 answer2: false,
127− answer3: true,
128− answer4: 0.5,
129− answer5: 0.5 },
127+ answer3: true },
130128 { source:widgetData2["source"],
131129 zoomable:true,
132130 answer1: false,
133131 answer2: true,
134− answer3: false,
135− answer4: 0.8870230941024013,
136− answer5: 0.5 }
132+ answer3: false }
137133 ]
138134 }
139135
@@ -164,7 +160,7 @@ Rectangle {
164160 var y2End = zoomableImage.height * 5 / 6;
165161
166162 var oldScale = image.scale;
167−
163+ var newScale = -1;
168164 // move mouse to center
169165 mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
170166
@@ -173,20 +169,23 @@ Rectangle {
173169 wait(3000); // have to delay between two consequent pinch event.
174170 // pinch zoom-in
175171 touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);
172+ waitForRendering(image);
176173
177− tryCompare(image, "scale", data.answer4);
178− var newScale = image.scale;
174+ if (newScale == -1) {
175+ newScale = image.scale;
176+ }
177+ tryCompare(image, "scale", newScale);
179178 compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);
180179 compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
181180 compare(signalSpy.count == 0, data.answer3, "scale signal count error");
182− compare(newScale, data.answer4, "scale factor error");
181+ compare(image.scale, newScale, "scale factor error");
183182 compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
184183 compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
185184
186185 wait(3000); // have to delay between two consequent pinch event.
187186 // pinch zoom-out
188187 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
189− tryCompare(image, "scale", data.answer5);
188+ tryCompare(image, "scale", oldScale);
190189 compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
191190 compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
192191 }