diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-08-06 21:40:01 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-09-28 11:01:43 +0000 |
commit | 9e2f4e112776149be550dbea6003a192cd931538 (patch) | |
tree | 5c9b9ba8709edb24139179c1a37784a9f693b39c /tests | |
parent | 3eb9ee34c06d54ea21fedd3188c60e536a487b1c (diff) |
Port from devicePixelRatioF() to devicePixelRatio()
This ports all of QtDeclarative.
Change-Id: Ie6eb4d96b4d49fbed1e8be514d03e331549cd712
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp | 4 | ||||
-rw-r--r-- | tests/manual/quickwidgetviewer/main.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp index e205d2e8f2..40ef85ca3b 100644 --- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp +++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp @@ -380,8 +380,8 @@ void tst_qquickwidget::readback() QImage img = view->grabFramebuffer(); QVERIFY(!img.isNull()); - QCOMPARE(img.width(), qCeil(view->width() * view->devicePixelRatioF())); - QCOMPARE(img.height(), qCeil(view->height() * view->devicePixelRatioF())); + QCOMPARE(img.width(), qCeil(view->width() * view->devicePixelRatio())); + QCOMPARE(img.height(), qCeil(view->height() * view->devicePixelRatio())); QRgb pix = img.pixel(5, 5); QCOMPARE(pix, qRgb(255, 0, 0)); diff --git a/tests/manual/quickwidgetviewer/main.cpp b/tests/manual/quickwidgetviewer/main.cpp index 0f305b0328..1754b39242 100644 --- a/tests/manual/quickwidgetviewer/main.cpp +++ b/tests/manual/quickwidgetviewer/main.cpp @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) std::cout << " OpenGL \"" << glFunctions->glGetString(GL_RENDERER) << "\" \"" << glFunctions->glGetString(GL_VERSION) << '"'; } - const qreal devicePixelRatio = w.devicePixelRatioF(); + const qreal devicePixelRatio = w.devicePixelRatio(); if (!qFuzzyCompare(devicePixelRatio, qreal(1))) std::cout << ", DPR=" << devicePixelRatio; std::cout << '\n'; |