Make qt_findAtNxFile return the source device pixel ratio

QTextImageHandler needs it.
And QQuickImageBase will also need it.

Change-Id: Ica5d17519c4c6c06e25bab7d2b1d3733f4058425
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp
index 747ed90281..16d81a7d6d 100644
--- a/src/gui/text/qtextimagehandler.cpp
+++ b/src/gui/text/qtextimagehandler.cpp
@@ -44,8 +44,10 @@
 
 QT_BEGIN_NAMESPACE
 
-extern QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio);
-static QString resolveFileName(QString fileName, QUrl *url, qreal targetDevicePixelRatio)
+extern QString qt_findAtNxFile(const QString &baseFileName, qreal targetDevicePixelRatio,
+                               qreal *sourceDevicePixelRatio);
+static QString resolveFileName(QString fileName, QUrl *url, qreal targetDevicePixelRatio,
+                               qreal *sourceDevicePixelRatio)
 {
     // We might use the fileName for loading if url loading fails
     // try to make sure it is a valid file path.
@@ -64,7 +66,7 @@ static QString resolveFileName(QString fileName, QUrl *url, qreal targetDevicePi
         return fileName;
 
     // try to find a Nx version
-    return qt_findAtNxFile(fileName, targetDevicePixelRatio);
+    return qt_findAtNxFile(fileName, targetDevicePixelRatio, sourceDevicePixelRatio);
 }
 
 
@@ -76,7 +78,8 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format, con
     if (name.startsWith(QLatin1String(":/"))) // auto-detect resources and convert them to url
         name.prepend(QLatin1String("qrc"));
     QUrl url = QUrl(name);
-    name = resolveFileName(name, &url, devicePixelRatio);
+    qreal sourcePixelRatio = 1.0;
+    name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio);
     const QVariant data = doc->resource(QTextDocument::ImageResource, url);
     if (data.type() == QVariant::Pixmap || data.type() == QVariant::Image) {
         pm = qvariant_cast<QPixmap>(data);
@@ -102,7 +105,7 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format, con
     }
 
     if (name.contains(QStringLiteral("@2x")))
-        pm.setDevicePixelRatio(2.0);
+        pm.setDevicePixelRatio(sourcePixelRatio);
 
     return pm;
 }
@@ -157,7 +160,8 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format, const
     if (name.startsWith(QLatin1String(":/"))) // auto-detect resources
         name.prepend(QLatin1String("qrc"));
     QUrl url = QUrl(name);
-    name = resolveFileName(name, &url, devicePixelRatio);
+    qreal sourcePixelRatio = 1.0;
+    name = resolveFileName(name, &url, devicePixelRatio, &sourcePixelRatio);
     const QVariant data = doc->resource(QTextDocument::ImageResource, url);
     if (data.type() == QVariant::Image) {
         image = qvariant_cast<QImage>(data);
@@ -181,8 +185,8 @@ static QImage getImage(QTextDocument *doc, const QTextImageFormat &format, const
         doc->addResource(QTextDocument::ImageResource, url, image);
     }
 
-    if (name.contains(QStringLiteral("@2x")))
-        image.setDevicePixelRatio(2.0);
+    if (sourcePixelRatio != 1.0)
+        image.setDevicePixelRatio(sourcePixelRatio);
 
     return image;
 }