From: Toby Tomkins <toby.tomkins@nokia.com>
Date: Tue, 13 Mar 2012 01:17:54 +0000 (+1000)
Subject: Default image scaling behaviour has changed; fix autotest.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d541fdcbe68ea6fab78db1009d8291c7f73cc1e5;p=konrad%2Fqtdeclarative.git

Default image scaling behaviour has changed; fix autotest.

The default image scaling behaviour has changed in qtdeclarative. This
change fixes the autotest to conform to fixed ratio scaling.

Change-Id: I9c901825295fb04cab74c46f61696c5274ddd943
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---

diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index eda56fa..be815d8 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -369,11 +369,11 @@ void tst_qquickimage::svg()
     QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->width(), 300.0);
-    QCOMPARE(obj->height(), 300.0);
+    QCOMPARE(obj->height(), 273.0);
     obj->setSourceSize(QSize(200,200));
 
     QCOMPARE(obj->width(), 200.0);
-    QCOMPARE(obj->height(), 200.0);
+    QCOMPARE(obj->height(), 182.0);
     delete obj;
 }