From b10c135a1026b3d379ec7cf47907ab08c7dc5ba4 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Thu, 10 Nov 2022 16:56:10 +0100
Subject: [PATCH] qmldesigner: remove delayedResetView();

Change-Id: Ie577b6b686a10e4e3525ba858a70bea0b4077566
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 .../materialeditor/materialeditorview.cpp        | 16 +++-------------
 .../materialeditor/materialeditorview.h          |  1 -
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
index 58bb81434fb..b1594f80f93 100644
--- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
+++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp
@@ -320,16 +320,6 @@ MaterialEditorView *MaterialEditorView::instance()
     return s_instance;
 }
 
-void MaterialEditorView::delayedResetView()
-{
-    // TODO: it seems the delayed reset is not needed. Leaving it commented out for now just in case it
-    // turned out to be needed. Otherwise will be removed after a small testing period.
-//    if (m_timerId)
-//        killTimer(m_timerId);
-//    m_timerId = startTimer(50);
-    resetView();
-}
-
 void MaterialEditorView::timerEvent(QTimerEvent *timerEvent)
 {
     if (m_timerId == timerEvent->timerId())
@@ -929,7 +919,7 @@ void MaterialEditorView::currentStateChanged(const ModelNode &node)
 {
     QmlModelState newQmlModelState(node);
     Q_ASSERT(newQmlModelState.isValid());
-    delayedResetView();
+    resetView();
 }
 
 void MaterialEditorView::instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList)
@@ -964,7 +954,7 @@ void MaterialEditorView::nodeTypeChanged(const ModelNode &node, const TypeName &
 {
      if (node == m_selectedMaterial) {
          m_qmlBackEnd->contextObject()->setCurrentType(QString::fromLatin1(typeName));
-         delayedResetView();
+         resetView();
      }
 }
 
@@ -972,7 +962,7 @@ void MaterialEditorView::rootNodeTypeChanged(const QString &type, int, int)
 {
     if (rootModelNode() == m_selectedMaterial) {
         m_qmlBackEnd->contextObject()->setCurrentType(type);
-        delayedResetView();
+        resetView();
     }
 }
 
diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
index 0e4581e48cb..5c0a59d3a0e 100644
--- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
+++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
@@ -98,7 +98,6 @@ private:
     void requestPreviewRender();
     void applyMaterialToSelectedModels(const ModelNode &material, bool add = false);
 
-    void delayedResetView();
     void setupQmlBackend();
 
     void commitVariantValueToModel(const PropertyName &propertyName, const QVariant &value);