diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /tests/auto/gui/image/qimage/tst_qimage.cpp | |
parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/gui/image/qimage/tst_qimage.cpp')
-rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index 6f372b0160..b668f57909 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -86,6 +86,7 @@ private slots: #endif void dotsPerMeterZero(); + void dotsPerMeterAndDpi(); void convertToFormatPreserveDotsPrMeter(); void convertToFormatPreserveText(); @@ -899,6 +900,27 @@ void tst_QImage::dotsPerMeterZero() QCOMPARE(img.dotsPerMeterX(), defaultDpmX); QCOMPARE(img.dotsPerMeterY(), defaultDpmY); + +} + +// verify that setting dotsPerMeter has an effect on the dpi. +void tst_QImage::dotsPerMeterAndDpi() +{ + QImage img(100, 100, QImage::Format_RGB32); + QVERIFY(!img.isNull()); + + QPoint defaultLogicalDpi(img.logicalDpiX(), img.logicalDpiY()); + QPoint defaultPhysicalDpi(img.physicalDpiX(), img.physicalDpiY()); + + img.setDotsPerMeterX(100); // set x + QCOMPARE(img.logicalDpiY(), defaultLogicalDpi.y()); // no effect on y + QCOMPARE(img.physicalDpiY(), defaultPhysicalDpi.y()); + QVERIFY(img.logicalDpiX() != defaultLogicalDpi.x()); // x changed + QVERIFY(img.physicalDpiX() != defaultPhysicalDpi.x()); + + img.setDotsPerMeterY(200); // set y + QVERIFY(img.logicalDpiY() != defaultLogicalDpi.y()); // y changed + QVERIFY(img.physicalDpiY() != defaultPhysicalDpi.y()); } void tst_QImage::rotate_data() |