1 files changed, 63 insertions, 2 deletions

diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index 115fe53430..f6720f96e3 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -91,6 +91,8 @@ private slots:
     void sourceSizeChanges();
     void correctStatus();
     void highdpi();
+    void highDpiFillModesAndSizes_data();
+    void highDpiFillModesAndSizes();
     void hugeImages();
 
 private:
@@ -398,11 +400,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;
 }
@@ -971,6 +973,65 @@ void tst_qquickimage::highdpi()
     delete obj;
 }
 
+void tst_qquickimage::highDpiFillModesAndSizes_data()
+{
+    QTest::addColumn<QQuickImage::FillMode>("fillMode");
+    QTest::addColumn<qreal>("expectedHeightAfterSettingWidthTo100");
+    QTest::addColumn<qreal>("expectedImplicitHeightAfterSettingWidthTo100");
+    QTest::addColumn<qreal>("expectedPaintedWidthAfterSettingWidthTo100");
+    QTest::addColumn<qreal>("expectedPaintedHeightAfterSettingWidthTo100");
+
+    QTest::addRow("Stretch") << QQuickImage::Stretch << 150.0 << 150.0 << 100.0 << 150.0;
+    QTest::addRow("PreserveAspectFit") << QQuickImage::PreserveAspectFit << 100.0 << 100.0 << 100.0 << 100.0;
+    QTest::addRow("PreserveAspectCrop") << QQuickImage::PreserveAspectCrop << 150.0 << 150.0 << 150.0 << 150.0;
+    QTest::addRow("Tile") << QQuickImage::Tile << 150.0 << 150.0 << 100.0 << 150.0;
+    QTest::addRow("TileVertically") << QQuickImage::TileVertically << 150.0 << 150.0 << 100.0 << 150.0;
+    QTest::addRow("TileHorizontally") << QQuickImage::TileHorizontally << 150.0 << 150.0 << 100.0 << 150.0;
+    QTest::addRow("Pad") << QQuickImage::Pad << 150.0 << 150.0 << 150.0 << 150.0;
+}
+
+void tst_qquickimage::highDpiFillModesAndSizes()
+{
+    QFETCH(QQuickImage::FillMode, fillMode);
+    QFETCH(qreal, expectedHeightAfterSettingWidthTo100);
+    QFETCH(qreal, expectedImplicitHeightAfterSettingWidthTo100);
+    QFETCH(qreal, expectedPaintedWidthAfterSettingWidthTo100);
+    QFETCH(qreal, expectedPaintedHeightAfterSettingWidthTo100);
+
+    QString componentStr = "import QtQuick 2.0\nImage { source: srcImage; }";
+    QQmlComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+
+    engine.rootContext()->setContextProperty("srcImage", testFileUrl("heart-highdpi@2x.png"));
+
+    QScopedPointer<QQuickImage> image(qobject_cast<QQuickImage*>(component.create()));
+    QVERIFY(image);
+    QCOMPARE(image->width(), 150.0);
+    QCOMPARE(image->height(), 150.0);
+    QCOMPARE(image->paintedWidth(), 150.0);
+    QCOMPARE(image->paintedHeight(), 150.0);
+    QCOMPARE(image->implicitWidth(), 150.0);
+    QCOMPARE(image->implicitHeight(), 150.0);
+    QCOMPARE(image->paintedWidth(), 150.0);
+    QCOMPARE(image->paintedHeight(), 150.0);
+
+    // The implicit size should not change when setting any fillMode here.
+    image->setFillMode(fillMode);
+    QCOMPARE(image->fillMode(), fillMode);
+    QCOMPARE(image->implicitWidth(), 150.0);
+    QCOMPARE(image->implicitHeight(), 150.0);
+    QCOMPARE(image->paintedWidth(), 150.0);
+    QCOMPARE(image->paintedHeight(), 150.0);
+
+    image->setWidth(100.0);
+    QCOMPARE(image->width(), 100.0);
+    QCOMPARE(image->height(), expectedHeightAfterSettingWidthTo100);
+    QCOMPARE(image->implicitWidth(), 150.0);
+    QCOMPARE(image->implicitHeight(), expectedImplicitHeightAfterSettingWidthTo100);
+    QCOMPARE(image->paintedWidth(), expectedPaintedWidthAfterSettingWidthTo100);
+    QCOMPARE(image->paintedHeight(), expectedPaintedHeightAfterSettingWidthTo100);
+}
+
 void tst_qquickimage::hugeImages()
 {
     QQuickView view;