diff options
| author | Ulf Hermann <[email protected]> | 2014-02-13 12:53:21 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2014-02-18 14:45:01 +0100 |
| commit | f3267b8893b8f8c83a7e3eded20c9f343ea4db51 (patch) | |
| tree | 96949a02091f184b609d7cddaff343831e2d8d34 /src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | |
| parent | 70aa948f0cda79db2ef274b67b8a5136d5cf3126 (diff) | |
QmlProfiler: Don't throw an assert if app is killed while profiling.
Without this you get lines like this on the console:
SOFT ASSERT: "m_state == Done || m_state == Empty" in file
[...]/qmlprofilermodelmanager.cpp, line 62
Change-Id: Ia3fb98cd5e9fb683e3265d0fd3ed1ca99784270d
Reviewed-by: Kai Koehne <[email protected]>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp')
| -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 9ead0965b4e..f218e78ea12 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -58,7 +58,7 @@ void QmlProfilerDataState::setState(QmlProfilerDataState::State state) switch (state) { case ClearingData: - QTC_ASSERT(m_state == Done || m_state == Empty, /**/); + QTC_ASSERT(m_state == Done || m_state == Empty || m_state == AcquiringData, /**/); break; case Empty: // if it's not empty, complain but go on |