diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-02-15 14:10:20 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-15 14:10:20 +0000 |
| commit | 471f8421bc4d75adc8e4a357d525ade9ede20e29 (patch) | |
| tree | 4c4e132b5c218433ed2619de9c6f53b914103fe0 /tests/auto/quick/qquickimage/tst_qquickimage.cpp | |
| parent | 421dcfb5792a5ff5e5a9851e0c1edf6e87422680 (diff) | |
| parent | 4d525de33e2ee55e69bb6c90fc11049a0f8b36b5 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.10' into 5.11" into refs/staging/5.11
Diffstat (limited to 'tests/auto/quick/qquickimage/tst_qquickimage.cpp')
| -rw-r--r-- | tests/auto/quick/qquickimage/tst_qquickimage.cpp | 4 |
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 f458bdcf5b..783e4aab4c 100644 --- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp @@ -412,11 +412,11 @@ void tst_qquickimage::svg() component.setData(componentStr.toLatin1(), QUrl::fromLocalFile("")); QQuickImage *obj = qobject_cast<QQuickImage*>(component.create()); QVERIFY(obj != 0); - QCOMPARE(int(obj->width()), 212); // round down: highdpi can give back fractional values + QCOMPARE(obj->width(), 300.0); QCOMPARE(obj->height(), 300.0); obj->setSourceSize(QSize(200,200)); - QCOMPARE(int(obj->width()), 141); // round down: highdpi can give back fractional values + QCOMPARE(obj->width(), 200.0); QCOMPARE(obj->height(), 200.0); delete obj; } |