3 files changed, 45 insertions, 24 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 7a59adffb8..af3af516db 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -45,6 +45,7 @@
 #include "qcache.h"
 #include "qdebug.h"
 #include "qpalette.h"
+#include "qmath.h"
 
 #include "private/qhexstring_p.h"
 #include "private/qguiapplication_p.h"
@@ -1026,19 +1027,13 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State
     } else {
         detach();
     }
+
     d->engine->addFile(fileName, size, mode, state);
 
-    // Check if a "@2x" file exists and add it.
-    static bool disable2xImageLoading = !qEnvironmentVariableIsEmpty("QT_HIGHDPI_DISABLE_2X_IMAGE_LOADING");
-    if (!disable2xImageLoading && qApp->devicePixelRatio() > 1.0) {
-        QString at2xfileName = fileName;
-        int dotIndex = fileName.lastIndexOf(QLatin1Char('.'));
-        if (dotIndex == -1) /* no dot */
-            dotIndex = fileName.size(); /* append */
-        at2xfileName.insert(dotIndex, QStringLiteral("@2x"));
-        if (QFile::exists(at2xfileName))
-            d->engine->addFile(at2xfileName, size, mode, state);
-    }
+    // Check if a "@Nx" file exists and add it.
+    QString atNxFileName = qt_findAtNxFile(fileName, qApp->devicePixelRatio());
+    if (atNxFileName != fileName)
+        d->engine->addFile(atNxFileName, size, mode, state);
 }
 
 /*!
@@ -1375,5 +1370,39 @@ QDebug operator<<(QDebug dbg, const QIcon &i)
     \internal
 */
 
+/*!
+    \internal
+    \since 5.6
+    Attempts to find a suitable @Nx file for the given \a targetDevicePixelRatio
+    Returns the the \a baseFileName if no such file was found.
+
+    Given base foo.png and a target dpr of 2.5, this function will look for
+    foo@3x.png, then foo@2x, then fall back to foo.png if not found.
+*/
+QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio)
+{
+    if (targetDevicePixelRatio <= 1.0)
+        return baseFileName;
+
+    static bool disableNxImageLoading = !qEnvironmentVariableIsEmpty("QT_HIGHDPI_DISABLE_2X_IMAGE_LOADING");
+    if (disableNxImageLoading)
+        return baseFileName;
+
+    QString atNx = QLatin1String("@%1x");
+    int dotIndex = baseFileName.lastIndexOf(QLatin1Char('.'));
+    if (dotIndex == -1) /* no dot */
+        dotIndex = baseFileName.size(); /* append */
+
+    // Check for @Nx, ..., @3x, @2x file versions,
+    for (int n = qCeil(targetDevicePixelRatio); n > 1; --n) {
+        QString atNxfileName = baseFileName;
+        atNxfileName.insert(dotIndex, atNx.arg(n));
+        if (QFile::exists(atNxfileName))
+            return atNxfileName;
+    }
+
+    return baseFileName;
+}
+
 QT_END_NAMESPACE
 #endif //QT_NO_ICON
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index ccddf69101..8c72f54629 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -139,6 +139,8 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &);
 Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QIcon &);
 #endif
 
+Q_GUI_EXPORT QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio);
+
 QT_END_NAMESPACE
 
 #endif // QICON_H
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp
index 1ba2cb31ca..747ed90281 100644
--- a/src/gui/text/qtextimagehandler.cpp
+++ b/src/gui/text/qtextimagehandler.cpp
@@ -44,6 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
+extern QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio);
 static QString resolveFileName(QString fileName, QUrl *url, qreal targetDevicePixelRatio)
 {
     // We might use the fileName for loading if url loading fails
@@ -62,19 +63,8 @@ static QString resolveFileName(QString fileName, QUrl *url, qreal targetDevicePi
     if (targetDevicePixelRatio <= 1.0)
         return fileName;
 
-    // try to find a 2x version
-
-    const int dotIndex = fileName.lastIndexOf(QLatin1Char('.'));
-    if (dotIndex != -1) {
-        QString at2xfileName = fileName;
-        at2xfileName.insert(dotIndex, QStringLiteral("@2x"));
-        if (QFile::exists(at2xfileName))  {
-            fileName = at2xfileName;
-            *url = QUrl(fileName);
-        }
-    }
-
-    return fileName;
+    // try to find a Nx version
+    return qt_findAtNxFile(fileName, targetDevicePixelRatio);
 }