From 0b6be2f93d54102ce15aa9008353db67935b8b77 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Fri, 4 Sep 2020 17:45:19 +0300
Subject: [PATCH] QmlDesigner: Update resources file system model on model
 attach

Removed the update from old places.
ViewManager::attachItemLibraryView one was never called and
the other DesignDocument::updateFileName one gets called incorrectly
on any file rename, not just the currently open one.

Change-Id: I822ced6fe32dd9625d605e33046c808eb2272028
Fixes: QDS-2721
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
---
 .../qmldesigner/components/integration/designdocument.cpp       | 2 --
 .../qmldesigner/components/itemlibrary/itemlibraryview.cpp      | 2 ++
 src/plugins/qmldesigner/designercore/model/viewmanager.cpp      | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index 26d7712e1d1..412efc77f06 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -207,8 +207,6 @@ void DesignDocument::updateFileName(const Utils::FilePath & /*oldFileName*/, con
     if (m_inFileComponentModel)
         m_inFileComponentModel->setFileUrl(QUrl::fromLocalFile(newFileName.toString()));
 
-    viewManager().setItemLibraryViewResourcePath(newFileName.toFileInfo().absolutePath());
-
     emit displayNameChanged(displayName());
 }
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
index 82306a5ab70..5ffece61cd9 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
@@ -32,6 +32,7 @@
 #include <bindingproperty.h>
 #include <nodelistproperty.h>
 #include <utils/algorithm.h>
+#include <qmldesignerplugin.h>
 #include "metainfo.h"
 
 namespace QmlDesigner {
@@ -75,6 +76,7 @@ void ItemLibraryView::modelAttached(Model *model)
     model->attachView(m_importManagerView);
     m_hasErrors = !rewriterView()->errors().isEmpty();
     m_widget->setFlowMode(QmlItemNode(rootModelNode()).isFlowView());
+    setResourcePath(QmlDesignerPlugin::instance()->documentManager().currentDesignDocument()->fileName().toFileInfo().absolutePath());
 }
 
 void ItemLibraryView::modelAboutToBeDetached(Model *model)
diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
index 34a2d4e4cfc..3177e122d16 100644
--- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
@@ -224,7 +224,6 @@ void ViewManager::detachViewsExceptRewriterAndComponetView()
 
 void ViewManager::attachItemLibraryView()
 {
-    setItemLibraryViewResourcePath(currentDesignDocument()->fileName().toFileInfo().absolutePath());
     currentModel()->attachView(&d->itemLibraryView);
 }