diff --git a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp --- a/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp +++ b/src/qmlcontrols/kquickcontrolsaddons/qimageitem.cpp @@ -157,24 +157,24 @@ return; } - QRect sourceRect = m_paintedRect; + QRectF sourceRect = m_paintedRect; - QRect destRect; + QRectF destRect; switch (m_fillMode) { case PreserveAspectFit: { - QSize scaled = m_image.size(); + QSizeF scaled = m_image.size(); - scaled.scale(boundingRect().size().toSize(), Qt::KeepAspectRatio); - destRect = QRect(QPoint(0, 0), scaled); + scaled.scale(boundingRect().size(), Qt::KeepAspectRatio); + destRect = QRectF(QPoint(0, 0), scaled); destRect.moveCenter(boundingRect().center().toPoint()); break; } case PreserveAspectCrop: { - QSize scaled = m_image.size(); + QSizeF scaled = m_image.size(); - scaled.scale(boundingRect().size().toSize(), Qt::KeepAspectRatioByExpanding); - destRect = QRect(QPoint(0, 0), scaled); + scaled.scale(boundingRect().size(), Qt::KeepAspectRatioByExpanding); + destRect = QRectF(QPoint(0, 0), scaled); destRect.moveCenter(boundingRect().center().toPoint()); break; } @@ -195,7 +195,7 @@ } if (destRect != sourceRect) { - m_paintedRect = destRect; + m_paintedRect = destRect.toRect(); emit paintedHeightChanged(); emit paintedWidthChanged(); } diff --git a/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp b/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp --- a/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp +++ b/src/qmlcontrols/kquickcontrolsaddons/qpixmapitem.cpp @@ -160,24 +160,25 @@ return; } - QRect sourceRect = m_paintedRect; + QRectF sourceRect = m_paintedRect; - QRect destRect; + QRectF destRect; switch (m_fillMode) { case PreserveAspectFit: { - QSize scaled = m_pixmap.size(); + QSizeF scaled = m_pixmap.size(); - scaled.scale(boundingRect().size().toSize(), Qt::KeepAspectRatio); - destRect = QRect(QPoint(0, 0), scaled); + scaled.scale(boundingRect().size(), Qt::KeepAspectRatio); + destRect = QRectF(QPoint(0, 0), scaled); destRect.moveCenter(boundingRect().center().toPoint()); + break; } case PreserveAspectCrop: { - QSize scaled = m_pixmap.size(); + QSizeF scaled = m_pixmap.size(); - scaled.scale(boundingRect().size().toSize(), Qt::KeepAspectRatioByExpanding); - destRect = QRect(QPoint(0, 0), scaled); + scaled.scale(boundingRect().size(), Qt::KeepAspectRatioByExpanding); + destRect = QRectF(QPoint(0, 0), scaled); destRect.moveCenter(boundingRect().center().toPoint()); break; } @@ -198,7 +199,7 @@ } if (destRect != sourceRect) { - m_paintedRect = destRect; + m_paintedRect = destRect.toRect(); emit paintedHeightChanged(); emit paintedWidthChanged(); }