diff options
author | Liang Qi <liang.qi@qt.io> | 2018-04-26 10:12:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-04-26 13:08:13 +0200 |
commit | 1169242f14f9e27cbe4e3360dd47d0825eaf9e60 (patch) | |
tree | 63e79e41bc48b9dc3cd40d3c29bacfd303c3c7b6 /src/qml | |
parent | 9f731b6841bbc9b7425a95303369d05be895f949 (diff) | |
parent | f95c18b04e260a633d7a1d7cb0d3aaca01f9782f (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/imports.pro
src/src.pro
Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/debugger/qqmlprofilerdefinitions_p.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/qml/debugger/qqmlprofilerdefinitions_p.h b/src/qml/debugger/qqmlprofilerdefinitions_p.h index f84a2c44e2..7b972c5d0d 100644 --- a/src/qml/debugger/qqmlprofilerdefinitions_p.h +++ b/src/qml/debugger/qqmlprofilerdefinitions_p.h @@ -96,11 +96,6 @@ struct QQmlProfilerDefinitions { MaximumRangeType }; - enum BindingType { - QmlBinding, - MaximumBindingType - }; - enum PixmapEventType { PixmapSizeKnown, PixmapReferenceCountChanged, @@ -129,8 +124,6 @@ struct QQmlProfilerDefinitions { NumGUIThreadFrameTypes = MaximumSceneGraphFrameType - NumRenderThreadFrameTypes }; - typedef QV4::Profiling::MemoryType MemoryType; - enum ProfileFeature { ProfileJavaScript, ProfileMemory, @@ -162,26 +155,6 @@ struct QQmlProfilerDefinitions { MaximumInputEventType }; - - static ProfileFeature featureFromRangeType(RangeType range) - { - switch (range) { - case Painting: - return ProfilePainting; - case Compiling: - return ProfileCompiling; - case Creating: - return ProfileCreating; - case Binding: - return ProfileBinding; - case HandlingSignal: - return ProfileHandlingSignal; - case Javascript: - return ProfileJavaScript; - default: - return MaximumProfileFeature; - } - } }; QT_END_NAMESPACE |