1 files changed, 9 insertions, 3 deletions
diff --git a/src/quick/util/qquickprofiler.cpp b/src/quick/util/qquickprofiler.cpp
index f8d090cc2c..841a1c9bcf 100644
--- a/src/quick/util/qquickprofiler.cpp
+++ b/src/quick/util/qquickprofiler.cpp
@@ -70,7 +70,7 @@ void QQuickProfiler::registerAnimationCallback()
 
 class CallbackRegistrationHelper : public QObject {
     Q_OBJECT
-public slots:
+public:
     void registerAnimationTimerCallback()
     {
         QQuickProfiler::registerAnimationCallback();
@@ -86,7 +86,12 @@ QQuickProfiler::QQuickProfiler(QObject *parent) : QObject(parent)
     m_timer.start();
     CallbackRegistrationHelper *helper = new CallbackRegistrationHelper; // will delete itself
     helper->moveToThread(QCoreApplication::instance()->thread());
-    QMetaObject::invokeMethod(helper, "registerAnimationTimerCallback", Qt::QueuedConnection);
+
+    // Queue the signal to have the animation timer registration run in the right thread;
+    QObject signalSource;
+    connect(&signalSource, &QObject::destroyed,
+            helper, &CallbackRegistrationHelper::registerAnimationTimerCallback,
+            Qt::QueuedConnection);
 }
 
 QQuickProfiler::~QQuickProfiler()
@@ -110,8 +115,9 @@ void QQuickProfiler::stopProfilingImpl()
     m_data.clear();
 }
 
-void QQuickProfiler::reportDataImpl()
+void QQuickProfiler::reportDataImpl(bool trackLocations)
 {
+    Q_UNUSED(trackLocations);
     QMutexLocker lock(&m_dataMutex);
     emit dataReady(m_data);
     m_data.clear();