From 0817f7ae5e59a0e0a72aef918e6038a2ceeedfef Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 12 Mar 2024 22:50:03 +0100
Subject: [PATCH] Utils: Replace imageFileWithResolution with qt_findAtNxFile

qt_findAtNxFile does a better job at returing a suited @Nx-image for
"exotic" device pixel ratios. This change fixes for example the active
mode icon when running Qt Creator at 250% ui scaling.

Task-number: QTCREATORBUG-30464
Change-Id: Ia90ba3573fcd4af7941322d7dbc8905fe140192b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/libs/utils/stylehelper.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 23beeb4b3ff..69b5e395565 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -11,6 +11,7 @@
 #include <QCommonStyle>
 #include <QFileInfo>
 #include <QFontDatabase>
+#include <QIcon>
 #include <QPainter>
 #include <QPainterPath>
 #include <QPixmapCache>
@@ -856,11 +857,7 @@ QString StyleHelper::dpiSpecificImageFile(const QString &fileName)
 
 QString StyleHelper::imageFileWithResolution(const QString &fileName, int dpr)
 {
-    const QFileInfo fi(fileName);
-    return dpr == 1 ? fileName :
-                      fi.path() + QLatin1Char('/') + fi.completeBaseName()
-                      + QLatin1Char('@') + QString::number(dpr)
-                      + QLatin1String("x.") + fi.suffix();
+    return qt_findAtNxFile(fileName, dpr);
 }
 
 QList<int> StyleHelper::availableImageResolutions(const QString &fileName)