diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-09-01 13:45:24 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-09-10 17:28:11 +0200 |
commit | b3c991ae8f9da6d8eb26f10b3d4ab08587588c9e (patch) | |
tree | 8f2ff32cadf9b8733701b8f99229a6135f53f7d7 /tests/auto/widgets/kernel/qwidget | |
parent | e1ce78d48498a3de21fe4714e92e2c0fcf1a0813 (diff) |
Port from devicePixelRatioF() to devicePixelRatio()
This ports all of QtBase.
Change-Id: If6712da44d7749b97b74f4614a04fac360f69d9e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qwidget')
-rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index d670f19d0e..b3a2323d3e 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -3602,7 +3602,7 @@ protected: static QPixmap grabFromWidget(QWidget *w, const QRect &rect) { QPixmap pixmap = w->grab(rect); - const qreal devicePixelRatio = pixmap.devicePixelRatioF(); + const qreal devicePixelRatio = pixmap.devicePixelRatio(); if (!qFuzzyCompare(devicePixelRatio, qreal(1))) { pixmap = pixmap.scaled((QSizeF(pixmap.size()) / devicePixelRatio).toSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation); @@ -5638,7 +5638,7 @@ bool verifyColor(QWidget &child, const QRegion ®ion, const QColor &color, int const QPixmap pixmap = grabBackingStore ? child.grab(rect) : grabWindow(window, rect.left(), rect.top(), rect.width(), rect.height()); - const QSize actualSize = pixmap.size() / pixmap.devicePixelRatioF(); + const QSize actualSize = pixmap.size() / pixmap.devicePixelRatio(); if (!QTest::qCompare(actualSize, rect.size(), "pixmap.size()", "rect.size()", __FILE__, callerLine)) return false; QPixmap expectedPixmap(pixmap); /* ensure equal formats */ @@ -9270,8 +9270,8 @@ void tst_QWidget::translucentWidget() widgetSnapshot = label.grab(QRect(QPoint(0, 0), label.size())); #endif const QImage actual = widgetSnapshot.toImage().convertToFormat(QImage::Format_RGB32); - QImage expected = pm.toImage().scaled(label.devicePixelRatioF() * pm.size()); - expected.setDevicePixelRatio(label.devicePixelRatioF()); + QImage expected = pm.toImage().scaled(label.devicePixelRatio() * pm.size()); + expected.setDevicePixelRatio(label.devicePixelRatio()); QCOMPARE(actual.size(),expected.size()); QCOMPARE(actual,expected); |