aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickimage
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2012-03-13 11:17:54 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-13 06:53:11 +0100
commitd541fdcbe68ea6fab78db1009d8291c7f73cc1e5 (patch)
treed362cc12a57edfbebe4eedb3bcf227a0a0148ddf /tests/auto/quick/qquickimage
parentfa9fcf2fb259b1b3eb09e0c853075ca328e930c5 (diff)
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>
Diffstat (limited to 'tests/auto/quick/qquickimage')
-rw-r--r--tests/auto/quick/qquickimage/tst_qquickimage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index eda56fa789..be815d8973 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;
}