feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	plugins/qmlprofilerextension/memoryusagemodel.cpp

Change-Id: I444eb11c167cd44b3e68cbe34210d3bcdf039cb4
This commit is contained in:
Eike Ziller
2014-11-26 11:18:54 +01:00
parent fad69ea995 bfc37d6973
commit 848336251a
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/qmlprofilerextension/memoryusagemodel.cpp
View File

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

26
plugins/qmlprofilerextension/qmlprofilerextension.qbs Normal file
View File

@@ -0,0 +1,26 @@
import qbs
QtcPlugin {
name: "QmlProfilerExtension"
Depends { name: "Core" }
Depends { name: "LicenseChecker" }
Depends { name: "QmlProfiler" }
Depends { name: "Qt.widgets" }
files: [
"inputeventsmodel.cpp",
"inputeventsmodel.h",
"memoryusagemodel.cpp",
"memoryusagemodel.h",
"pixmapcachemodel.cpp",
"pixmapcachemodel.h",
"qmlprofilerextensionconstants.h",
"qmlprofilerextensionplugin.cpp",
"qmlprofilerextensionplugin.h",
"qmlprofilerextension_global.h",
"scenegraphtimelinemodel.cpp",
"scenegraphtimelinemodel.h",
]
}