diff options
author | Morten Sørvig <morten.sorvig@qt.io> | 2021-08-16 08:41:57 +0200 |
---|---|---|
committer | Morten Sørvig <morten.sorvig@qt.io> | 2021-09-01 15:24:05 +0200 |
commit | 81a7344e1dea562271865ddf94a7d7138e663ce4 (patch) | |
tree | 3289768b62776ec2d93619043253955aad169843 | |
parent | 4e460aa3f7fb5aa2f66a2a75b0aea82464ee5639 (diff) |
Port to QImage and QPixmap deviceIndependentSize()
Replace the “size() / devicePixelRatio()” pattern with
a call to deviceIndependentSize().
Change-Id: I9d9359e80b9e6643e7395028cd43e3261d449ae7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
20 files changed, 50 insertions, 60 deletions
diff --git a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp index bb1f83482b..a1431db0d3 100644 --- a/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp +++ b/examples/corelib/threads/mandelbrot/mandelbrotwidget.cpp @@ -109,7 +109,7 @@ void MandelbrotWidget::paintEvent(QPaintEvent * /* event */) //! [7] //! [8] auto previewPixmap = qFuzzyCompare(pixmap.devicePixelRatio(), qreal(1)) ? pixmap - : pixmap.scaled(pixmap.size() / pixmap.devicePixelRatio(), Qt::KeepAspectRatio, + : pixmap.scaled(pixmap.deviceIndependentSize().toSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation); double scaleFactor = pixmapScale / curScale; int newWidth = int(previewPixmap.width() * scaleFactor); @@ -216,7 +216,7 @@ void MandelbrotWidget::mouseReleaseEvent(QMouseEvent *event) pixmapOffset += event->position().toPoint() - lastDragPos; lastDragPos = QPoint(); - const auto pixmapSize = pixmap.size() / pixmap.devicePixelRatio(); + const auto pixmapSize = pixmap.deviceIndependentSize().toSize(); int deltaX = (width() - pixmapSize.width()) / 2 - pixmapOffset.x(); int deltaY = (height() - pixmapSize.height()) / 2 - pixmapOffset.y(); scroll(deltaX, deltaY); diff --git a/src/gui/kernel/qshapedpixmapdndwindow.cpp b/src/gui/kernel/qshapedpixmapdndwindow.cpp index e58d37693a..490860342d 100644 --- a/src/gui/kernel/qshapedpixmapdndwindow.cpp +++ b/src/gui/kernel/qshapedpixmapdndwindow.cpp @@ -104,9 +104,7 @@ void QShapedPixmapWindow::updateGeometry(const QPoint &pos) { QSize size(1, 1); if (!m_pixmap.isNull()) { - size = qFuzzyCompare(m_pixmap.devicePixelRatio(), qreal(1.0)) - ? m_pixmap.size() - : (QSizeF(m_pixmap.size()) / m_pixmap.devicePixelRatio()).toSize(); + size = m_pixmap.deviceIndependentSize().toSize(); } setGeometry(QRect(pos - m_hotSpot, size)); } diff --git a/src/gui/painting/qcoregraphics.mm b/src/gui/painting/qcoregraphics.mm index ef29f4a490..ad183f770b 100644 --- a/src/gui/painting/qcoregraphics.mm +++ b/src/gui/painting/qcoregraphics.mm @@ -145,7 +145,7 @@ QT_END_NAMESPACE // NSImage. auto nsImage = [[NSImage alloc] initWithSize:NSZeroSize]; auto *imageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage]; - imageRep.size = (image.size() / image.devicePixelRatio()).toCGSize(); + imageRep.size = image.deviceIndependentSize().toCGSize(); [nsImage addRepresentation:[imageRep autorelease]]; Q_ASSERT(CGSizeEqualToSize(nsImage.size, imageRep.size)); @@ -178,7 +178,7 @@ QT_END_NAMESPACE continue; auto *imageRep = [[NSBitmapImageRep alloc] initWithCGImage:cgImage]; - imageRep.size = (image.size() / image.devicePixelRatio()).toCGSize(); + imageRep.size = image.deviceIndependentSize().toCGSize(); [nsImage addRepresentation:[imageRep autorelease]]; } diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 9ca3de5cf2..3577d71869 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -967,12 +967,12 @@ void QPaintEngineEx::drawPolygon(const QPoint *points, int pointCount, PolygonDr void QPaintEngineEx::drawPixmap(const QPointF &pos, const QPixmap &pm) { - drawPixmap(QRectF(pos, pm.size() / pm.devicePixelRatio()), pm, pm.rect()); + drawPixmap(QRectF(pos, pm.deviceIndependentSize()), pm, pm.rect()); } void QPaintEngineEx::drawImage(const QPointF &pos, const QImage &image) { - drawImage(QRectF(pos, image.size() / image.devicePixelRatio()), image, image.rect()); + drawImage(QRectF(pos, image.deviceIndependentSize()), image, image.rect()); } void QPaintEngineEx::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp index 290aa256cb..2872366208 100644 --- a/src/gui/text/qtextimagehandler.cpp +++ b/src/gui/text/qtextimagehandler.cpp @@ -102,20 +102,19 @@ static QSize getPixmapSize(QTextDocument *doc, const QTextImageFormat &format) QSize size(width, height); if (!hasWidth || !hasHeight) { pm = getPixmap(doc, format); - const int pmWidth = pm.width() / pm.devicePixelRatio(); - const int pmHeight = pm.height() / pm.devicePixelRatio(); + const QSizeF pmSize = pm.deviceIndependentSize(); if (!hasWidth) { if (!hasHeight) - size.setWidth(pmWidth); + size.setWidth(pmSize.width()); else - size.setWidth(qRound(height * (pmWidth / (qreal) pmHeight))); + size.setWidth(qRound(height * (pmSize.width() / (qreal) pmSize.height()))); } if (!hasHeight) { if (!hasWidth) - size.setHeight(pmHeight); + size.setHeight(pmSize.height()); else - size.setHeight(qRound(width * (pmHeight / (qreal) pmWidth))); + size.setHeight(qRound(width * (pmSize.height() / (qreal) pmSize.width()))); } } @@ -171,10 +170,11 @@ static QSize getImageSize(QTextDocument *doc, const QTextImageFormat &format) QSize size(width, height); if (!hasWidth || !hasHeight) { image = getImage(doc, format); + QSizeF imageSize = image.deviceIndependentSize(); if (!hasWidth) - size.setWidth(image.width() / image.devicePixelRatio()); + size.setWidth(imageSize.width()); if (!hasHeight) - size.setHeight(image.height() / image.devicePixelRatio()); + size.setHeight(imageSize.height()); } qreal scale = 1.0; diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 4f141327e2..c81e91659c 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -3568,9 +3568,10 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter QPixmap pixmap = header->icon.pixmap(QSize(iconExtent, iconExtent), p->device()->devicePixelRatio(), mode); QRect pixr = header->rect; - pixr.setY(header->rect.center().y() - (pixmap.height() / pixmap.devicePixelRatio() - 1) / 2); + QSizeF size = pixmap.deviceIndependentSize(); + pixr.setY(header->rect.center().y() - (size.height() - 1) / 2); proxy()->drawItemPixmap(p, pixr, Qt::AlignVCenter, pixmap); - textr.translate(pixmap.width() / pixmap.devicePixelRatio() + 2, 0); + textr.translate(size.width() + 2, 0); } QString text = header->text; if (const QStyleOptionHeaderV2 *headerV2 = qstyleoption_cast<const QStyleOptionHeaderV2 *>(header)) { @@ -3627,12 +3628,13 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter // Draw the text if it's needed. if (tb->toolButtonStyle != Qt::ToolButtonIconOnly) { needText = true; + QSizeF size = pixmap.deviceIndependentSize(); if (tb->toolButtonStyle == Qt::ToolButtonTextUnderIcon) { - pr.setHeight(pixmap.size().height() / pixmap.devicePixelRatio() + 6); + pr.setHeight(size.height() + 6); cr.adjust(0, pr.bottom(), 0, -3); alignment |= Qt::AlignCenter; } else { - pr.setWidth(pixmap.width() / pixmap.devicePixelRatio() + 8); + pr.setWidth(size.width() + 8); cr.adjust(pr.right(), 0, 0, 0); alignment |= Qt::AlignLeft | Qt::AlignVCenter; } @@ -3812,12 +3814,11 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter if (btn.state & State_On) state = QIcon::On; QPixmap pixmap = btn.icon.pixmap(btn.iconSize, p->device()->devicePixelRatio(), mode, state); - int pixmapWidth = pixmap.width() / pixmap.devicePixelRatio(); - int pixmapHeight = pixmap.height() / pixmap.devicePixelRatio(); - contentW += pixmapWidth + QMacStylePrivate::PushButtonContentPadding; + QSizeF pixmapSize = pixmap.deviceIndependentSize(); + contentW += pixmapSize.width() + QMacStylePrivate::PushButtonContentPadding; int iconLeftOffset = freeContentRect.x() + (freeContentRect.width() - contentW) / 2; - int iconTopOffset = freeContentRect.y() + (freeContentRect.height() - pixmapHeight) / 2; - QRect iconDestRect(iconLeftOffset, iconTopOffset, pixmapWidth, pixmapHeight); + int iconTopOffset = freeContentRect.y() + (freeContentRect.height() - pixmapSize.height()) / 2; + QRect iconDestRect(iconLeftOffset, iconTopOffset, pixmapSize.width(), pixmapSize.height()); QRect visualIconDestRect = visualRect(btn.direction, freeContentRect, iconDestRect); proxy()->drawItemPixmap(p, visualIconDestRect, Qt::AlignLeft | Qt::AlignVCenter, pixmap); int newOffset = iconDestRect.x() + iconDestRect.width() @@ -4314,13 +4315,12 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter } #endif QPixmap pixmap = mi->icon.pixmap(iconSize, p->device()->devicePixelRatio(), mode); - int pixw = pixmap.width() / pixmap.devicePixelRatio(); - int pixh = pixmap.height() / pixmap.devicePixelRatio(); QRect cr(xpos, mi->rect.y(), checkcol, mi->rect.height()); - QRect pmr(0, 0, pixw, pixh); + QSize size = pixmap.deviceIndependentSize().toSize(); + QRect pmr(QPoint(0, 0), size); pmr.moveCenter(cr.center()); p->drawPixmap(pmr.topLeft(), pixmap); - xpos += pixw + 6; + xpos += size.width() + 6; } QString s = mi->text; diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp index 67d6b0c460..73be33b278 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp @@ -1273,9 +1273,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption pixmap = menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, option, widget), mode, QIcon::On); else pixmap = menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, option, widget), mode); - const int pixw = pixmap.width() / pixmap.devicePixelRatio(); - const int pixh = pixmap.height() / pixmap.devicePixelRatio(); - QRect pmr(0, 0, pixw, pixh); + QRect pmr(QPoint(0, 0), pixmap.deviceIndependentSize().toSize()); pmr.moveCenter(vCheckRect.center()); painter->setPen(menuitem->palette.text().color()); painter->drawPixmap(pmr.topLeft(), pixmap); diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp index 000c27e685..d91da5a04c 100644 --- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp @@ -1974,9 +1974,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op QPixmap pixmap = checked ? menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, option, widget), mode, QIcon::On) : menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, option, widget), mode); - const int pixw = pixmap.width() / pixmap.devicePixelRatio(); - const int pixh = pixmap.height() / pixmap.devicePixelRatio(); - QRect iconRect(0, 0, pixw, pixh); + QRect iconRect(QPoint(0, 0), pixmap.deviceIndependentSize().toSize()); iconRect.moveCenter(QRect(xpos, y, checkcol, h).center()); QRect vIconRect = visualRect(option->direction, option->rect, iconRect); p->setPen(menuitem->palette.text().color()); diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 3f73b8446f..04840fc96b 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -452,7 +452,7 @@ public: QSize minimumSizeHint() const override { if (!pixmap(Qt::ReturnByValue).isNull()) - return pixmap(Qt::ReturnByValue).size() / pixmap(Qt::ReturnByValue).devicePixelRatio(); + return pixmap(Qt::ReturnByValue).deviceIndependentSize().toSize(); return QFrame::minimumSizeHint(); } diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp index c23cfd7e44..c5cef305ea 100644 --- a/src/widgets/effects/qpixmapfilter.cpp +++ b/src/widgets/effects/qpixmapfilter.cpp @@ -885,7 +885,7 @@ Q_WIDGETS_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, if (p) { p->scale(scale, scale); p->setRenderHint(QPainter::SmoothPixmapTransform); - p->drawImage(QRect(QPoint(0, 0), blurImage.size() / blurImage.devicePixelRatio()), blurImage); + p->drawImage(QRect(QPoint(0, 0), blurImage.deviceIndependentSize().toSize()), blurImage); } } diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index cb014de6f4..2975cd1320 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -9585,9 +9585,9 @@ QRectF QGraphicsPixmapItem::boundingRect() const return QRectF(); if (d->flags & ItemIsSelectable) { qreal pw = 1.0; - return QRectF(d->offset, QSizeF(d->pixmap.size()) / d->pixmap.devicePixelRatio()).adjusted(-pw/2, -pw/2, pw/2, pw/2); + return QRectF(d->offset, d->pixmap.deviceIndependentSize()).adjusted(-pw/2, -pw/2, pw/2, pw/2); } else { - return QRectF(d->offset, QSizeF(d->pixmap.size()) / d->pixmap.devicePixelRatio()); + return QRectF(d->offset, d->pixmap.deviceIndependentSize()); } } diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp index 9c56c82578..9d755c0b55 100644 --- a/src/widgets/itemviews/qitemdelegate.cpp +++ b/src/widgets/itemviews/qitemdelegate.cpp @@ -1051,10 +1051,10 @@ QRect QItemDelegate::rect(const QStyleOptionViewItem &option, break; case QMetaType::QPixmap: { const QPixmap &pixmap = qvariant_cast<QPixmap>(value); - return QRect(QPoint(0, 0), pixmap.size() / pixmap.devicePixelRatio() ); } + return QRect(QPoint(0, 0), pixmap.deviceIndependentSize().toSize()); } case QMetaType::QImage: { const QImage &image = qvariant_cast<QImage>(value); - return QRect(QPoint(0, 0), image.size() / image.devicePixelRatio() ); } + return QRect(QPoint(0, 0), image.deviceIndependentSize().toSize()); } case QMetaType::QIcon: { QIcon::Mode mode = d->iconMode(option.state); QIcon::State state = d->iconState(option.state); diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp index 97bf8ac939..975735eb15 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.cpp +++ b/src/widgets/itemviews/qstyleditemdelegate.cpp @@ -343,13 +343,13 @@ void QStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option, case QMetaType::QImage: { QImage image = qvariant_cast<QImage>(*value); option->icon = QIcon(QPixmap::fromImage(image)); - option->decorationSize = image.size() / image.devicePixelRatio(); + option->decorationSize = image.deviceIndependentSize().toSize(); break; } case QMetaType::QPixmap: { QPixmap pixmap = qvariant_cast<QPixmap>(*value); option->icon = QIcon(pixmap); - option->decorationSize = pixmap.size() / pixmap.devicePixelRatio(); + option->decorationSize = pixmap.deviceIndependentSize().toSize(); break; } default: diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 638915b342..5b268aa684 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -1652,10 +1652,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio else pixmap = menuItem->icon.pixmap(iconSize, painter->device()->devicePixelRatio(), mode); - const int pixw = pixmap.width() / pixmap.devicePixelRatio(); - const int pixh = pixmap.height() / pixmap.devicePixelRatio(); - - QRect pmr(0, 0, pixw, pixh); + QRect pmr(QPoint(0, 0), pixmap.deviceIndependentSize().toSize()); pmr.moveCenter(vCheckRect.center()); painter->setPen(menuItem->palette.text().color()); if (!ignoreCheckMark && checkable && checked) { diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index f26f1a16c8..8946b9d90e 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -573,8 +573,9 @@ QRect QStyle::itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pi int x, y, w, h; rect.getRect(&x, &y, &w, &h); - const int pixmapWidth = pixmap.width()/pixmap.devicePixelRatio(); - const int pixmapHeight = pixmap.height()/pixmap.devicePixelRatio(); + QSizeF pixmapSize = pixmap.deviceIndependentSize(); + const int pixmapWidth = pixmapSize.width(); + const int pixmapHeight = pixmapSize.height(); if ((alignment & Qt::AlignVCenter) == Qt::AlignVCenter) y += h/2 - pixmapHeight/2; diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 8c5b509eb5..39fabd1218 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1157,9 +1157,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai pixmap = menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, opt, widget), mode, QIcon::On); else pixmap = menuitem->icon.pixmap(proxy()->pixelMetric(PM_SmallIconSize, opt, widget), mode); - const int pixw = pixmap.width() / pixmap.devicePixelRatio(); - const int pixh = pixmap.height() / pixmap.devicePixelRatio(); - QRect pmr(0, 0, pixw, pixh); + QRect pmr(QPoint(0, 0), pixmap.deviceIndependentSize().toSize()); pmr.moveCenter(vCheckRect.center()); p->setPen(menuitem->palette.text().color()); p->drawPixmap(pmr.topLeft(), pixmap); diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index d701cd7d57..50e63dfd68 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -604,7 +604,7 @@ QSize QLabelPrivate::sizeForWidth(int w) const if (pixmap && !pixmap->isNull()) { br = pixmap->rect(); - br.setSize(br.size() / pixmap->devicePixelRatio()); + br.setSize(pixmap->deviceIndependentSize().toSize()); #ifndef QT_NO_PICTURE } else if (picture && !picture->isNull()) { br = picture->boundingRect(); @@ -612,7 +612,7 @@ QSize QLabelPrivate::sizeForWidth(int w) const #if QT_CONFIG(movie) } else if (movie && !movie->currentPixmap().isNull()) { br = movie->currentPixmap().rect(); - br.setSize(br.size() / movie->currentPixmap().devicePixelRatio()); + br.setSize(movie->currentPixmap().deviceIndependentSize().toSize()); #endif } else if (isTextLabel) { int align = QStyle::visualAlignment(textDirection(), QFlag(this->align)); diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 06ae0479d7..120bf590b9 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -422,7 +422,7 @@ ControlLabel::ControlLabel(QMdiSubWindow *subWindow, QWidget *parent) Q_UNUSED(subWindow); setFocusPolicy(Qt::NoFocus); updateWindowIcon(); - setFixedSize(label.size() / label.devicePixelRatio()); + setFixedSize(label.deviceIndependentSize().toSize()); } /* @@ -430,7 +430,7 @@ ControlLabel::ControlLabel(QMdiSubWindow *subWindow, QWidget *parent) */ QSize ControlLabel::sizeHint() const { - return label.size() / label.devicePixelRatio(); + return label.deviceIndependentSize().toSize(); } /* diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp index f417a997a7..8adb61c5f2 100644 --- a/src/widgets/widgets/qsplashscreen.cpp +++ b/src/widgets/widgets/qsplashscreen.cpp @@ -284,7 +284,7 @@ void QSplashScreen::setPixmap(const QPixmap &pixmap) d->pixmap = pixmap; setAttribute(Qt::WA_TranslucentBackground, pixmap.hasAlpha()); - const QRect r(QPoint(), pixmap.size() / pixmap.devicePixelRatio()); + const QRect r(QPoint(), pixmap.deviceIndependentSize().toSize()); resize(r.size()); move(screen()->geometry().center() - r.center()); diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index c9e71d8388..ad4f8e04bc 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -584,7 +584,7 @@ void tst_QLabel::taskQTBUG_48157_dprPixmap() pixmap.load(QFINDTESTDATA(QStringLiteral("red@2x.png"))); QCOMPARE(pixmap.devicePixelRatio(), 2.0); label.setPixmap(pixmap); - QCOMPARE(label.sizeHint(), pixmap.rect().size() / pixmap.devicePixelRatio()); + QCOMPARE(label.sizeHint(), pixmap.deviceIndependentSize().toSize()); } void tst_QLabel::taskQTBUG_48157_dprMovie() @@ -595,7 +595,7 @@ void tst_QLabel::taskQTBUG_48157_dprMovie() movie.start(); QCOMPARE(movie.currentPixmap().devicePixelRatio(), 2.0); label.setMovie(&movie); - QCOMPARE(label.sizeHint(), movie.currentPixmap().size() / movie.currentPixmap().devicePixelRatio()); + QCOMPARE(label.sizeHint(), movie.currentPixmap().deviceIndependentSize().toSize()); } void tst_QLabel::resourceProvider() |