Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/quick/items/qquickitem.cpp
	src/quick/items/qquicktext.cpp
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf

2 files changed, 6 insertions, 18 deletions

diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp
index 244e13888c..fb7c900252 100644
--- a/src/quick/util/qquickapplication.cpp
+++ b/src/quick/util/qquickapplication.cpp
@@ -123,7 +123,7 @@ bool QQuickApplication::eventFilter(QObject *, QEvent *event)
         if (d->isActive != wasActive) {
             emit activeChanged();
         }
-    } else if (event->type() == QEvent::LayoutDirectionChange) {
+    } else if (event->type() == QEvent::ApplicationLayoutDirectionChange) {
         Qt::LayoutDirection newDirection = QGuiApplication::layoutDirection();
         if (d->direction != newDirection) {
             d->direction = newDirection;
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
index 26258fdc5f..055d6b7e29 100644
--- a/src/quick/util/qquickpixmapcache.cpp
+++ b/src/quick/util/qquickpixmapcache.cpp
@@ -519,6 +519,9 @@ void QQuickPixmapReader::processJobs()
             runningJob->loading = true;
 
             QUrl url = runningJob->url;
+            QQmlPixmapProfiler pixmapProfiler;
+            pixmapProfiler.startLoading(url);
+
             QSize requestSize = runningJob->requestSize;
             locker.unlock();
             processJob(runningJob, url, requestSize);
@@ -897,8 +900,7 @@ bool QQuickPixmapReply::event(QEvent *event)
                 pixmapProfiler.finishLoading(data->url);
                 data->textureFactory = de->textureFactory;
                 data->implicitSize = de->implicitSize;
-                if (data->implicitSize.width() > 0)
-                    pixmapProfiler.setSize(url, data->implicitSize.width(), data->implicitSize.height());
+                pixmapProfiler.setSize(url, data->requestSize.width() > 0 ? data->requestSize : data->implicitSize);
             } else {
                 pixmapProfiler.errorLoading(data->url);
                 data->errorString = de->errorString;
@@ -968,8 +970,6 @@ void QQuickPixmapData::addToCache()
         inCache = true;
         QQmlPixmapProfiler pixmapProfiler;
         pixmapProfiler.cacheCountChanged(url, pixmapStore()->m_cache.count());
-        if (implicitSize.width() > 0)
-            pixmapProfiler.setSize(url, implicitSize.width(), implicitSize.height());
     }
 }
 
@@ -1033,17 +1033,6 @@ static QQuickPixmapData* createPixmapDataSync(QQuickPixmap *declarativePixmap, Q
     if (localFile.isEmpty()) 
         return 0;
 
-    // check for "retina" high-dpi and use @2x file if it exixts
-    if (qApp->devicePixelRatio() > 1) {
-        const int dotIndex = localFile.lastIndexOf(QLatin1Char('.'));
-        if (dotIndex != -1) {
-            QString retinaFile = localFile;
-            retinaFile.insert(dotIndex, QStringLiteral("@2x"));
-            if (QFile(retinaFile).exists())
-                localFile = retinaFile;
-        }
-    }
-
     QFile f(localFile);
     QSize readSize;
     QString errorString;
@@ -1256,8 +1245,7 @@ void QQuickPixmap::load(QQmlEngine *engine, const QUrl &url, const QSize &reques
             d = createPixmapDataSync(this, engine, url, requestSize, &ok);
             if (ok) {
                 pixmapProfiler.finishLoading(url);
-                if (d->implicitSize.width() > 0)
-                    QQmlPixmapProfiler().setSize(url, d->implicitSize.width(), d->implicitSize.height());
+                pixmapProfiler.setSize(url, d->requestSize.width() > 0 ? d->requestSize : d->implicitSize);
                 if (options & QQuickPixmap::Cache)
                     d->addToCache();
                 return;