diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-09 16:35:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-09 16:35:27 +0200 |
| commit | 8add61b2165f07c5c399c9e6e103b5e95759b801 (patch) | |
| tree | a9a6b7658470f1220a02b9bb120dcae54f896928 /src/plugins/qmlprofiler | |
| parent | 75adba735bd85bb68b91923ce74762c2ca9be5f0 (diff) | |
| parent | db4b3641f5235be9a67967e0cf33512da2b50f6b (diff) | |
Merge remote-tracking branch 'origin/4.13' into 4.14
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: Ia779a511d73d86d79dbcecd8cc3763cf3d605a87
Diffstat (limited to 'src/plugins/qmlprofiler')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 5b8735bdbb..e59731ffb3 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -395,7 +395,7 @@ QmlProfilerModelManager::rangeFilter(qint64 rangeStart, qint64 rangeEnd) const if (type.rangeType() != MaximumRangeType) { if (event.rangeStage() == RangeStart) stack.push(event); - else if (event.rangeStage() == RangeEnd) + else if (event.rangeStage() == RangeEnd && !stack.isEmpty()) stack.pop(); return true; } else if (isStateful(type)) { |