diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-11-26 11:18:54 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-11-26 11:18:54 +0100 |
| commit | 848336251a1b51838e6a5e5f3336dc57468f046e (patch) | |
| tree | 8e9dfdba9335f975f39ef2ab0210d77518a67c06 /plugins/qmlprofilerextension/memoryusagemodel.cpp | |
| parent | fad69ea99580367744f7ad0200b7198b65c3cb6d (diff) | |
| parent | bfc37d69732e1a504f4bb834001885e1407f9552 (diff) | |
Merge remote-tracking branch 'origin/3.3'
Conflicts:
plugins/qmlprofilerextension/memoryusagemodel.cpp
Change-Id: I444eb11c167cd44b3e68cbe34210d3bcdf039cb4
Diffstat (limited to 'plugins/qmlprofilerextension/memoryusagemodel.cpp')
| -rw-r--r-- | plugins/qmlprofilerextension/memoryusagemodel.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp index 189913d0a8..516bcc2c03 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.cpp +++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp @@ -32,6 +32,7 @@ MemoryUsageModel::MemoryUsageModel(QmlProfilerModelManager *manager, QObject *pa tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileMemory)), QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, parent) { + m_maxSize = 1; announceFeatures((1 << QmlDebug::ProfileMemory) | QmlDebug::Constants::QML_JS_RANGE_FEATURES); } |