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

QmlProfiler: remove now superfluous processingDone method

Browse Source 
This detour existed to ensure that the V8 model and the events model are
done processing before we call complete.

Change-Id: I89b3ec7935e63e8cbcdeaff74d407064456c07be
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
This commit is contained in:
Joerg Bornemann
2015-05-27 11:23:50 +02:00
parent 3e8a40c382
commit 2f33b50f74
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/qmlprofilerbasemodel.cpp
View File

@@ -96,7 +96,7 @@ void QmlProfilerBaseModel::detailsDone()
emit changed(); emit changed();
d->processingDone = true; d->processingDone = true;
d->modelManager->modelProxyCountUpdated(d->modelId, isEmpty() ? 0 : 1, 1); d->modelManager->modelProxyCountUpdated(d->modelId, isEmpty() ? 0 : 1, 1);
d->modelManager->modelProcessingDone(); d->modelManager->complete();
} }
} }

7
src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
View File

@@ -341,13 +341,6 @@ void QmlProfilerModelManager::complete()
} }
} }
void QmlProfilerModelManager::modelProcessingDone()
{
Q_ASSERT(state() == QmlProfilerDataState::ProcessingData);
if (d->model->processingDone())
complete();
}
void QmlProfilerModelManager::save(const QString &filename) void QmlProfilerModelManager::save(const QString &filename)
{ {
QFile *file = new QFile(filename); QFile *file = new QFile(filename);

1
src/plugins/qmlprofiler/qmlprofilermodelmanager.h
View File

@@ -150,7 +150,6 @@ public slots:
qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata4, qint64 ndata5); qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata4, qint64 ndata5);
void complete(); void complete();
void modelProcessingDone();
void save(const QString &filename); void save(const QString &filename);
void load(const QString &filename); void load(const QString &filename);