diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-08 12:41:25 +0200 |
| commit | 4545c81e570c477ae8821531dcfd593e09f950b0 (patch) | |
| tree | f756738ffaf55210a2aa1596407eeed94e504ae7 /src/plugins/qmlprofiler | |
| parent | d0839bc1de52acd0902364565b6f9d030e591646 (diff) | |
| parent | 75e408584ac9a60c3a4dd714f5620814485fcdca (diff) | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
doc/src/howto/creator-sidebar-views.qdoc
doc/src/howto/creator-ui.qdoc
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/autotest/testresultmodel.cpp
src/plugins/autotest/testresultmodel.h
Change-Id: I24cc585ca7782cb1d9cb0b8b73b46892b41937fd
Diffstat (limited to 'src/plugins/qmlprofiler')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertool.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index d7fa2fd7a9..ba5228f7c1 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -682,11 +682,9 @@ void QmlProfilerTool::clientsDisconnected() d->m_profilerModelManager->finalize(); } else if (d->m_profilerState->serverRecording()) { // If the application stopped by itself, check if we have all the data - if (d->m_profilerState->currentState() == QmlProfilerStateManager::AppDying || - d->m_profilerState->currentState() == QmlProfilerStateManager::Idle) { + if (d->m_profilerState->currentState() != QmlProfilerStateManager::AppStopRequested) { showNonmodalWarning(tr("Application finished before loading profiled data.\n" "Please use the stop button instead.")); - d->m_profilerModelManager->clearAll(); } } } |