From 1cf40ae647e3a74c8e837dd4f32f6c2fa1788223 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 28 Dec 2016 16:48:07 +0100
Subject: [PATCH] QmlProfiler: Don't register a model ID for the QML model

We never do anything useful with it. This relieves us from the need to
keep the manager around in the QML model and decouples them.

Change-Id: If58fc147b86b07f533aeaaa896f3416d4c0ef6bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp | 7 +------
 src/plugins/qmlprofiler/qmlprofilerdatamodel.h   | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp b/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
index cbd0d85dbf5..435eaadf34e 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerdatamodel.cpp
@@ -48,9 +48,6 @@ public:
     int resolveStackTop();
 
     QVector<QmlEventType> eventTypes;
-
-    QmlProfilerModelManager *modelManager;
-    int modelId;
     Internal::QmlProfilerDetailsRewriter *detailsRewriter;
 
     Utils::TemporaryFile file;
@@ -94,14 +91,12 @@ QString getInitialDetails(const QmlEventType &event)
     return details;
 }
 
-QmlProfilerDataModel::QmlProfilerDataModel(QmlProfilerModelManager *parent) :
+QmlProfilerDataModel::QmlProfilerDataModel(QObject *parent) :
     QObject(parent), d_ptr(new QmlProfilerDataModelPrivate)
 {
     Q_D(QmlProfilerDataModel);
     Q_ASSERT(parent);
     d->detailsRewriter = new QmlProfilerDetailsRewriter(this);
-    d->modelManager = parent;
-    d->modelId = d->modelManager->registerModelProxy();
     connect(d->detailsRewriter, &QmlProfilerDetailsRewriter::rewriteDetailsString,
             this, &QmlProfilerDataModel::detailsChanged);
     connect(d->detailsRewriter, &QmlProfilerDetailsRewriter::eventDetailsChanged,
diff --git a/src/plugins/qmlprofiler/qmlprofilerdatamodel.h b/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
index 9f86d74b773..fb60a881158 100644
--- a/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
+++ b/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
@@ -40,7 +40,7 @@ class QMLPROFILER_EXPORT QmlProfilerDataModel : public QObject
 {
     Q_OBJECT
 public:
-    explicit QmlProfilerDataModel(QmlProfilerModelManager *parent);
+    explicit QmlProfilerDataModel(QObject *parent = nullptr);
     ~QmlProfilerDataModel();
 
     const QmlEventType &eventType(int typeId) const;