diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-30 16:39:58 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-02 13:23:46 +0300 |
commit | ceb8f6a9ed305a16fb34033354b1b7bf0dc25162 (patch) | |
tree | faf306595d7ef38161238f6b23b283fc93f77709 | |
parent | cc5fe6a00e7f08a011c8c2c1938b1a8bc057ff10 (diff) | |
download | qt-creator-ceb8f6a9ed305a16fb34033354b1b7bf0dc25162.tar.gz |
Adapt to adding of main feature to QmlProfilerTimelineModel
Change-Id: I54e2037106c8f0f5a0115cb415633acc8f0a879b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
4 files changed, 10 insertions, 17 deletions
diff --git a/plugins/qmlprofilerextension/inputeventsmodel.cpp b/plugins/qmlprofilerextension/inputeventsmodel.cpp index 41403d9016..3609f4bd46 100644 --- a/plugins/qmlprofilerextension/inputeventsmodel.cpp +++ b/plugins/qmlprofilerextension/inputeventsmodel.cpp @@ -26,12 +26,10 @@ namespace Internal { using namespace QmlProfiler; InputEventsModel::InputEventsModel(QmlProfilerModelManager *manager, QObject *parent) : - QmlProfilerTimelineModel(manager, - tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileInputEvents)), - QmlDebug::Event, QmlDebug::MaximumRangeType, parent), - m_keyTypeId(-1), m_mouseTypeId(-1) + QmlProfilerTimelineModel(manager, QmlDebug::Event, QmlDebug::MaximumRangeType, + QmlDebug::ProfileInputEvents, parent), + m_keyTypeId(-1), m_mouseTypeId(-1) { - announceFeatures(1 << QmlDebug::ProfileInputEvents); } int InputEventsModel::typeId(int index) const diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp index 4510ed59c1..9d391176c9 100644 --- a/plugins/qmlprofilerextension/memoryusagemodel.cpp +++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp @@ -28,12 +28,11 @@ namespace Internal { using namespace QmlProfiler; MemoryUsageModel::MemoryUsageModel(QmlProfilerModelManager *manager, QObject *parent) : - QmlProfilerTimelineModel(manager, - tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileMemory)), - QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, parent) + QmlProfilerTimelineModel(manager, QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, + QmlDebug::ProfileMemory, parent) { m_maxSize = 1; - announceFeatures((1 << QmlDebug::ProfileMemory) | QmlDebug::Constants::QML_JS_RANGE_FEATURES); + announceFeatures((1ULL << mainFeature()) | QmlDebug::Constants::QML_JS_RANGE_FEATURES); } int MemoryUsageModel::rowMaxValue(int rowNumber) const diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index f6e998596a..b33748eebc 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -26,12 +26,10 @@ namespace Internal { using namespace QmlProfiler; PixmapCacheModel::PixmapCacheModel(QmlProfilerModelManager *manager, QObject *parent) : - QmlProfilerTimelineModel(manager, - tr(QmlProfilerModelManager::featureName(QmlDebug::ProfilePixmapCache)), - QmlDebug::PixmapCacheEvent, QmlDebug::MaximumRangeType, parent) + QmlProfilerTimelineModel(manager, QmlDebug::PixmapCacheEvent, QmlDebug::MaximumRangeType, + QmlDebug::ProfilePixmapCache, parent) { m_maxCacheSize = 1; - announceFeatures(1 << QmlDebug::ProfilePixmapCache); } int PixmapCacheModel::rowMaxValue(int rowNumber) const diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 7e0bd79f5e..9b85596544 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -70,11 +70,9 @@ Q_STATIC_ASSERT(sizeof(StageLabels) == SceneGraphTimelineModel::SceneGraphTimelineModel(QmlProfilerModelManager *manager, QObject *parent) : - QmlProfilerTimelineModel(manager, - tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileSceneGraph)), - QmlDebug::SceneGraphFrame, QmlDebug::MaximumRangeType, parent) + QmlProfilerTimelineModel(manager, QmlDebug::SceneGraphFrame, QmlDebug::MaximumRangeType, + QmlDebug::ProfileSceneGraph, parent) { - announceFeatures(1 << QmlDebug::ProfileSceneGraph); } int SceneGraphTimelineModel::expandedRow(int index) const |