aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2014-04-03 12:33:14 +0200
committerUlf Hermann <[email protected]>2014-04-04 11:47:35 +0200
commit12f5bbccebc82b49291bf8d4c432a88454c60e58 (patch)
tree1254752e625dbb2e70810dbe876fb0d2bcd9987f /src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
parentd8adc10fbe2d662fefacd3f348da532ce847c619 (diff)
QmlProfiler: Guess the trace end time if we don't receive EndTrace
Task-number: QTCREATORBUG-11952 Change-Id: Ie55b616a1fc54e0cccac5560ec66fb7cc496c8e2 Reviewed-by: Robert Loehning <[email protected]> Reviewed-by: Kai Koehne <[email protected]> Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index ace876168d9..2955832505e 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -172,8 +172,8 @@ void QmlProfilerClientManager::connectClientSignals()
{
QTC_ASSERT(d->profilerState, return);
if (d->qmlclientplugin) {
- connect(d->qmlclientplugin.data(), SIGNAL(complete()),
- this, SLOT(qmlComplete()));
+ connect(d->qmlclientplugin.data(), SIGNAL(complete(qint64)),
+ this, SLOT(qmlComplete(qint64)));
connect(d->qmlclientplugin.data(),
SIGNAL(rangedEvent(int,int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation,
qint64,qint64,qint64,qint64,qint64)),
@@ -354,8 +354,10 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
}
}
-void QmlProfilerClientManager::qmlComplete()
+void QmlProfilerClientManager::qmlComplete(qint64 maximumTime)
{
+ if (maximumTime > d->modelManager->traceTime()->endTime())
+ d->modelManager->traceTime()->setEndTime(maximumTime);
d->qmlDataReady = true;
if (!d->v8clientplugin || d->v8clientplugin.data()->status() != QmlDebug::Enabled || d->v8DataReady) {
emit dataReadyForProcessing();