qmlprofiler: Allow aggregation of multiple traces into one file.

Change-Id: Ifc9f9adafa3178e68212fb97914a6f4cae9a4c83
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp
index c5992652f8..eaa7cc0e7e 100644
--- a/tools/qmlprofiler/qmlprofilerdata.cpp
+++ b/tools/qmlprofiler/qmlprofilerdata.cpp
@@ -187,8 +187,8 @@ void QmlProfilerData::clear()
     d->clearV8RootEvent();
     d->v8MeasuredTime = 0;
 
-    d->traceEndTime = 0;
-    d->traceStartTime = -1;
+    d->traceEndTime = std::numeric_limits<qint64>::min();
+    d->traceStartTime = std::numeric_limits<qint64>::max();
     d->qmlMeasuredTime = 0;
 
     setState(Empty);
@@ -226,12 +226,14 @@ QString QmlProfilerData::qmlMessageAsString(QQmlProfilerService::Message type)
 
 void QmlProfilerData::setTraceStartTime(qint64 time)
 {
-    d->traceStartTime = time;
+    if (time < d->traceStartTime)
+        d->traceStartTime = time;
 }
 
 void QmlProfilerData::setTraceEndTime(qint64 time)
 {
-    d->traceEndTime = time;
+    if (time > d->traceEndTime)
+        d->traceEndTime = time;
 }
 
 qint64 QmlProfilerData::traceStartTime() const