Merge remote-tracking branch 'origin/3.2'

Change-Id: I1a26f3e2fb838df2d3df1784d6a8ea65fbcf4418
This commit is contained in:
Eike Ziller
2014-07-04 11:41:32 +02:00

View File

@@ -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;
}
{