QQmlProfilerService: Drop support for non-location-tracking clients

All known QML profiler clients track locations by now.

Change-Id: I1613da87dab22cfadfc25a35678d3e816ecda189
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 9 insertions, 8 deletions

diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index 1c4daba6af..4c798e0131 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -59,7 +59,7 @@ Q_QML_DEBUG_PLUGIN_LOADER(QQmlAbstractProfilerAdapter)
 
 QQmlProfilerServiceImpl::QQmlProfilerServiceImpl(QObject *parent) :
     QQmlConfigurableDebugService<QQmlProfilerService>(1, parent),
-    m_waitingForStop(false), m_useMessageTypes(false)
+    m_waitingForStop(false)
 {
     m_timer.start();
     QQmlAbstractProfilerAdapter *quickAdapter =
@@ -324,7 +324,7 @@ void QQmlProfilerServiceImpl::stopProfiling(QJSEngine *engine)
     m_waitingForStop = true;
 
     for (QQmlAbstractProfilerAdapter *profiler : qAsConst(reporting))
-        profiler->reportData(m_useMessageTypes);
+        profiler->reportData();
 
     for (QQmlAbstractProfilerAdapter *profiler : qAsConst(stopping))
         profiler->stopProfiling();
@@ -359,8 +359,7 @@ void QQmlProfilerServiceImpl::sendMessages()
         m_startTimes.erase(m_startTimes.begin());
         qint64 next = first->sendMessages(m_startTimes.isEmpty() ?
                                               std::numeric_limits<qint64>::max() :
-                                              m_startTimes.begin().key(), messages,
-                                          m_useMessageTypes);
+                                              m_startTimes.begin().key(), messages);
         if (next != -1)
             m_startTimes.insert(next, first);
 
@@ -446,13 +445,15 @@ void QQmlProfilerServiceImpl::messageReceived(const QByteArray &message)
                        &m_flushTimer, &QTimer::stop);
         }
     }
+
+    bool useMessageTypes = false;
     if (!stream.atEnd())
-        stream >> m_useMessageTypes;
+        stream >> useMessageTypes;
 
     // If engineId == -1 objectForId() and then the cast will return 0.
-    if (enabled)
+    if (enabled && useMessageTypes) // If the client doesn't support message types don't profile.
         startProfiling(qobject_cast<QJSEngine *>(objectForId(engineId)), features);
-    else
+    else if (!enabled)              // On stopProfiling the client doesn't repeat useMessageTypes.
         stopProfiling(qobject_cast<QJSEngine *>(objectForId(engineId)));
 
     stopWaiting();
@@ -478,7 +479,7 @@ void QQmlProfilerServiceImpl::flush()
     }
 
     for (QQmlAbstractProfilerAdapter *profiler : qAsConst(reporting))
-        profiler->reportData(m_useMessageTypes);
+        profiler->reportData();
 }
 
 QT_END_NAMESPACE