Merge branch '3.2'

Change-Id: I15f9db0dd9d65ceaff9503c535abd7abcbd1eccc

2 files changed, 17 insertions, 2 deletions

diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index 8cf9a42158..8bd6ff2741 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -269,10 +269,10 @@ void MemoryUsageModel::loadData()
     }
 
     if (currentJSHeapIndex != -1)
-        d->insertEnd(currentJSHeapIndex, simpleModel->lastTimeMark() -
+        d->insertEnd(currentJSHeapIndex, traceEndTime() -
                      d->range(currentJSHeapIndex).start - 1);
     if (currentUsageIndex != -1)
-        d->insertEnd(currentUsageIndex, simpleModel->lastTimeMark() -
+        d->insertEnd(currentUsageIndex, traceEndTime() -
                      d->range(currentUsageIndex).start - 1);
 
 
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index ea297b04bc..f3b8a02761 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -456,6 +456,21 @@ void PixmapCacheModel::loadData()
             if (state.loadState == Initial) {
                 newEvent.pixmapEventType = PixmapLoadingStarted;
                 state.started = d->insert(traceStartTime(), startTime - traceStartTime(), newEvent);
+
+                // All other indices are wrong now as we've prepended. Fix them ...
+                if (lastCacheSizeEvent >= state.started)
+                    ++lastCacheSizeEvent;
+
+                for (int pixmapIndex = 0; pixmapIndex < d->pixmaps.count(); ++pixmapIndex) {
+                    Pixmap &brokenPixmap = d->pixmaps[pixmapIndex];
+                    for (int sizeIndex = 0; sizeIndex < brokenPixmap.sizes.count(); ++sizeIndex) {
+                        PixmapState &brokenSize = brokenPixmap.sizes[sizeIndex];
+                        if ((pixmapIndex != newEvent.urlIndex || sizeIndex != newEvent.sizeIndex) &&
+                                brokenSize.started >= state.started) {
+                            ++brokenSize.started;
+                        }
+                    }
+                }
             }
 
             d->insertEnd(state.started, startTime - d->range(state.started).start);