feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: manage receiving trace after app stopped

Browse Source 
Change-Id: I97409748ebac3ee8af3690f2d84d3038638a3419
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christiaan Janssen
2012-05-08 15:14:11 +02:00
parent 5bf0280b2a
commit ba9c802e1e
7 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmlprofiler/qmlprofilerengine.cpp
View File

@@ -216,10 +216,9 @@ void QmlProfilerEngine::stop()
cancelProcess();
break;
}
case QmlProfilerStateManager::AppKilled : {
d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle);
case QmlProfilerStateManager::AppDying :
// valid, but no further action is needed
break;
}
default:
qDebug() << tr("Unexpected engine stop from state %1 in %2:%3").arg(d->m_profilerState->currentStateAsString(), QString(__FILE__), QString::number(__LINE__));
break;
@@ -232,18 +231,16 @@ void QmlProfilerEngine::processEnded()
switch (d->m_profilerState->currentState()) {
case QmlProfilerStateManager::AppRunning : {
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppKilled);
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
AnalyzerManager::stopTool();
emit finished();
break;
}
case QmlProfilerStateManager::AppStopped :
// fallthrough
case QmlProfilerStateManager::AppKilled : {
case QmlProfilerStateManager::AppKilled :
d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle);
break;
}
default:
qDebug() << tr("Process died unexpectedly from state %1 in %2:%3").arg(d->m_profilerState->currentStateAsString(), QString(__FILE__), QString::number(__LINE__));
break;
@@ -260,7 +257,7 @@ void QmlProfilerEngine::cancelProcess()
break;
}
case QmlProfilerStateManager::AppRunning : {
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppKilled);
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
break;
}
default: {
@@ -298,7 +295,7 @@ void QmlProfilerEngine::wrongSetupMessageBox(const QString &errorMessage)
infoBox->show();
// KILL
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppKilled);
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppDying);
AnalyzerManager::stopTool();
emit finished();
}