QmlProfiler: allow for multiple sequential traces to be aggregated

Task-number: QTCREATORBUG-13317
Change-Id: Ic7d1d5c94d8d522741b6c4207a21a43f521da5fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index 39e87bb808..c031a8d317 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -63,6 +63,7 @@ public:
     quint64 tcpPort;
     QString sysroot;
     quint32 flushInterval;
+    bool aggregateTraces;
 
     QmlProfilerModelManager *modelManager;
 };
@@ -77,6 +78,7 @@ QmlProfilerClientManager::QmlProfilerClientManager(QObject *parent) :
     d->connection = 0;
     d->connectionAttempts = 0;
     d->flushInterval = 0;
+    d->aggregateTraces = true;
 
     d->modelManager = 0;
 
@@ -101,6 +103,16 @@ void QmlProfilerClientManager::setFlushInterval(quint32 flushInterval)
     d->flushInterval = flushInterval;
 }
 
+bool QmlProfilerClientManager::aggregateTraces() const
+{
+    return d->aggregateTraces;
+}
+
+void QmlProfilerClientManager::setAggregateTraces(bool aggregateTraces)
+{
+    d->aggregateTraces = aggregateTraces;
+}
+
 void QmlProfilerClientManager::setTcpConnection(QString host, quint64 port)
 {
     d->tcpHost = host;
@@ -349,7 +361,7 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result)
 void QmlProfilerClientManager::qmlComplete(qint64 maximumTime)
 {
     d->modelManager->traceTime()->increaseEndTime(maximumTime);
-    if (d->modelManager)
+    if (d->modelManager && !d->aggregateTraces)
         d->modelManager->acquiringDone();
 }