1 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
index affd2a417e..1c4daba6af 100644
--- a/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
@@ -41,9 +41,9 @@
 #include "qv4profileradapter.h"
 #include "qqmlprofileradapter.h"
 #include "qqmlprofilerservicefactory.h"
-#include "qqmldebugpacket.h"
 
 #include <private/qjsengine_p.h>
+#include <private/qqmldebugpacket_p.h>
 #include <private/qqmldebugpluginmanager_p.h>
 
 #include <QtCore/qurl.h>
@@ -126,7 +126,7 @@ void QQmlProfilerServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
                 = new QQmlProfilerAdapter(this, &(enginePrivate->typeLoader));
         addEngineProfiler(compileAdapter, engine);
     }
-    QV4ProfilerAdapter *v4Adapter = new QV4ProfilerAdapter(this, QV8Engine::getV4(engine->handle()));
+    QV4ProfilerAdapter *v4Adapter = new QV4ProfilerAdapter(this, engine->handle());
     addEngineProfiler(v4Adapter, engine);
     QQmlConfigurableDebugService<QQmlProfilerService>::engineAboutToBeAdded(engine);
 }
@@ -240,7 +240,7 @@ void QQmlProfilerServiceImpl::startProfiling(QJSEngine *engine, quint64 features
 
     QQmlDebugPacket d;
 
-    d << m_timer.nsecsElapsed() << (int)Event << (int)StartTrace;
+    d << m_timer.nsecsElapsed() << static_cast<qint32>(Event) << static_cast<qint32>(StartTrace);
     bool startedAny = false;
     if (engine != 0) {
         const auto range = qAsConst(m_engineProfilers).equal_range(engine);
@@ -339,7 +339,8 @@ void QQmlProfilerServiceImpl::sendMessages()
 
     QQmlDebugPacket traceEnd;
     if (m_waitingForStop) {
-        traceEnd << m_timer.nsecsElapsed() << (int)Event << (int)EndTrace;
+        traceEnd << m_timer.nsecsElapsed() << static_cast<qint32>(Event)
+                 << static_cast<qint32>(EndTrace);
 
         QSet<QJSEngine *> seen;
         for (QQmlAbstractProfilerAdapter *profiler : qAsConst(m_startTimes)) {
@@ -384,7 +385,7 @@ void QQmlProfilerServiceImpl::sendMessages()
         if (!stillRunning) {
             // Complete is only sent once, when no engines are running anymore.
             QQmlDebugPacket ds;
-            ds << (qint64)-1 << (int)Complete;
+            ds << static_cast<qint64>(-1) << static_cast<qint32>(Complete);
             messages << ds.data();
             m_waitingForStop = false;
         }
@@ -422,7 +423,7 @@ void QQmlProfilerServiceImpl::messageReceived(const QByteArray &message)
     int engineId = -1;
     quint64 features = std::numeric_limits<quint64>::max();
     bool enabled;
-    uint flushInterval = 0;
+    quint32 flushInterval = 0;
     stream >> enabled;
     if (!stream.atEnd())
         stream >> engineId;
@@ -430,7 +431,9 @@ void QQmlProfilerServiceImpl::messageReceived(const QByteArray &message)
         stream >> features;
     if (!stream.atEnd()) {
         stream >> flushInterval;
-        m_flushTimer.setInterval(flushInterval);
+        m_flushTimer.setInterval(
+                    static_cast<int>(qMin(flushInterval,
+                                          static_cast<quint32>(std::numeric_limits<int>::max()))));
         auto timerStart = static_cast<void(QTimer::*)()>(&QTimer::start);
         if (flushInterval > 0) {
             connect(&m_flushTimer, &QTimer::timeout, this, &QQmlProfilerServiceImpl::flush);