diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-27 16:04:24 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-15 15:25:21 +0000 |
commit | 0c955153454ab66fe9eedf189359b5c5ca307a2f (patch) | |
tree | 78d3f0bb96294bd91a6ea41e01a84089220ae1af /src/qml/debugger/qqmlprofilerdefinitions_p.h | |
parent | 79adf5e2da6a22c908620f67a894be92c02c886d (diff) |
Actively translate feature flags between QML and V4 profilers
Relying on the enums to be equal is somewhat dangerous.
Change-Id: I0d5ebd37a2310b8916e521f7261bbf88786e712f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qqmlprofilerdefinitions_p.h')
-rw-r--r-- | src/qml/debugger/qqmlprofilerdefinitions_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmlprofilerdefinitions_p.h b/src/qml/debugger/qqmlprofilerdefinitions_p.h index 1213b67b3c..952eafed29 100644 --- a/src/qml/debugger/qqmlprofilerdefinitions_p.h +++ b/src/qml/debugger/qqmlprofilerdefinitions_p.h @@ -126,8 +126,8 @@ struct QQmlProfilerDefinitions { typedef QV4::Profiling::MemoryType MemoryType; enum ProfileFeature { - ProfileJavaScript = QV4::Profiling::FeatureFunctionCall, - ProfileMemory = QV4::Profiling::FeatureMemoryAllocation, + ProfileJavaScript, + ProfileMemory, ProfilePixmapCache, ProfileSceneGraph, ProfileAnimations, |