aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2014-07-04 11:41:32 +0200
committerEike Ziller <eike.ziller@digia.com>2014-07-04 11:42:21 +0200
commitcc4602b3f898a9b7510682eee45a02786097eb67 (patch)
tree33a88ca82c0443728bdc45886049722707b67bf9
parent1695a020974aa861a386245a1c6ca85db725a787 (diff)
parent8c260ba1a6a28fec32d3ea31dd6bbd92965da672 (diff)
Merge remote-tracking branch 'origin/3.2'
-rw-r--r--plugins/qmlprofilerextension/pixmapcachemodel.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index ec4da50f10..ea297b04bc 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -209,6 +209,11 @@ const QVariantList PixmapCacheModel::getEventDetails(int index) const
if (ev->pixmapEventType != PixmapCacheCountChanged) {
d->addVP(result, tr("Duration"), ev->duration );
+ } else {
+ QVariantMap res;
+ res.insert(tr("Cache Size"), QVariant(QString::fromLatin1("%1 px")
+ .arg(ev->cacheSize)));
+ result << res;
}
{