Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly

Change-Id: I7556ac62fd8e1aeb99186c929f1225f02f9d2430

1 files changed, 6 insertions, 1 deletions

diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index 6b8567439b..8c59a68982 100644
--- a/src/quick/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qquicksprite_p.h"
+#include "qquickimagebase_p.h"
 #include <qqml.h>
 #include <QDebug>
 #include <QRandomGenerator>
@@ -222,6 +223,7 @@ QQuickSprite::QQuickSprite(QObject *parent)
     , m_frameDuration(unsetDuration)
     , m_frameDurationVariation(0)
     , m_frameSync(false)
+    , m_devicePixelRatio(1.0)
 {
 }
 
@@ -265,7 +267,10 @@ void QQuickSprite::startImageLoading()
             if (!e)
                 qWarning() << "QQuickSprite: Cannot find QQmlEngine - this class is only for use in QML and may not work";
         }
-        m_pix.load(e, m_source);
+        QUrl loadUrl = m_source;
+        QQuickImageBase::resolve2xLocalFile(m_source, m_devicePixelRatio, &loadUrl, &m_devicePixelRatio);
+
+        m_pix.load(e, loadUrl);
     }
 }