From 19706de70ecdfc99c2a099800604c811b0593202 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Thu, 15 Aug 2024 19:10:35 +0200 Subject: [PATCH] QPA/Windows: Avoid confusing warning about empty QPixmap Fix the condition to really don't call scaledPixmap() on an empty pixmap. This amends db328ca975bc63f3baf3d021dcff1ea37fa6b6a0. Pick-to: 6.7 6.5 Task-number: QTBUG-122755 Change-Id: I10470704fff162f699a936f7b61451c02e3bf4e9 Reviewed-by: Oliver Wolff Reviewed-by: Volker Hilsheimer (cherry picked from commit c1d2de095e420315c626fc08d6d6a5e2a34a1870) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/windows/qwindowsdrag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp index c9e7ae90a9e..ea4cac5a592 100644 --- a/src/plugins/platforms/windows/qwindowsdrag.cpp +++ b/src/plugins/platforms/windows/qwindowsdrag.cpp @@ -272,7 +272,7 @@ void QWindowsOleDropSource::createCursors() hotSpotScaleFactor = QHighDpiScaling::factor(platformScreen); pixmapScaleFactor = hotSpotScaleFactor / pixmap.devicePixelRatio(); } - QPixmap scaledPixmap = (hasPixmap && qFuzzyCompare(pixmapScaleFactor, 1.0)) + QPixmap scaledPixmap = (!hasPixmap || qFuzzyCompare(pixmapScaleFactor, 1.0)) ? pixmap : pixmap.scaled((QSizeF(pixmap.size()) * pixmapScaleFactor).toSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation);