From 83be08fe4140e23c9c6b2b2f1102d8a7e60f4674 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 11 Sep 2014 11:23:07 +0200 Subject: Respect the "hidden" property when generating labels Change-Id: I96a40813ad8aebcb86ddc9ed08327fe836681267 Reviewed-by: Kai Koehne --- plugins/qmlprofilerextension/memoryusagemodel.cpp | 2 +- plugins/qmlprofilerextension/pixmapcachemodel.cpp | 2 +- plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp index c7fcdcd270..f3f9cfcc3c 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.cpp +++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp @@ -113,7 +113,7 @@ QVariantList MemoryUsageModel::labels() const Q_D(const MemoryUsageModel); QVariantList result; - if (d->expanded && !isEmpty()) { + if (d->expanded && !d->hidden && !isEmpty()) { { QVariantMap element; element.insert(QLatin1String("description"), QVariant(tr("Memory Allocation"))); diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index 708c4c2a64..4289abe4da 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -148,7 +148,7 @@ QVariantList PixmapCacheModel::labels() const Q_D(const PixmapCacheModel); QVariantList result; - if (d->expanded && !isEmpty()) { + if (d->expanded && !d->hidden && !isEmpty()) { { // Cache Size QVariantMap element; diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 3510bdbe3a..d9321c750c 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -142,7 +142,7 @@ QVariantList SceneGraphTimelineModel::labels() const Q_D(const SceneGraphTimelineModel); QVariantList result; - if (d->expanded && !isEmpty()) { + if (d->expanded && !d->hidden && !isEmpty()) { for (int i = 0; i < MaximumSceneGraphStage; ++i) { QVariantMap element; element.insert(QLatin1String("displayName"), tr(ThreadLabels[i < MaximumGUIThreadStage ? -- cgit v1.2.3