diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index bd169af5b24..ac6a19d11be 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -306,11 +306,6 @@ void DesignDocument::changeToSubComponent(const ModelNode &componentNode) attachRewriterToModel(); } -void DesignDocument::changeToExternalSubComponent(const QString &fileName) -{ - Core::EditorManager::openEditor(fileName, Core::Id(), Core::EditorManager::DoNotMakeVisible); -} - void DesignDocument::attachRewriterToModel() { QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h index 234aeb15bbe..e2e789032d5 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.h +++ b/src/plugins/qmldesigner/components/integration/designdocument.h @@ -119,7 +119,6 @@ public slots: void updateActiveQtVersion(); void changeToSubComponentAndPushOnCrumblePath(const ModelNode &componentNode); void changeToSubComponent(const ModelNode &componentNode); - void changeToExternalSubComponent(const QString &m_oldFileName); private slots: void updateFileName(const QString &oldFileName, const QString &newFileName); diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp index a8f726c317b..9b83cb8a6d1 100644 --- a/src/plugins/qmldesigner/documentmanager.cpp +++ b/src/plugins/qmldesigner/documentmanager.cpp @@ -102,13 +102,14 @@ static inline void openFileForComponent(const ModelNode &node) if (node.metaInfo().isFileComponent()) { //getWidthHeight(node, width, height); getProperties(node, propertyHash); - currentDesignDocument()->changeToExternalSubComponent(node.metaInfo().componentFileName()); + Core::EditorManager::openEditor(node.metaInfo().componentFileName(), Core::Id(), Core::EditorManager::DoNotMakeVisible); } else if (node.metaInfo().isView() && node.hasNodeProperty("delegate") && node.nodeProperty("delegate").modelNode().metaInfo().isFileComponent()) { //getWidthHeight(node, width, height); getProperties(node, propertyHash); - currentDesignDocument()->changeToExternalSubComponent(node.nodeProperty("delegate").modelNode().metaInfo().componentFileName()); + Core::EditorManager::openEditor(node.nodeProperty("delegate").modelNode().metaInfo().componentFileName(), + Core::Id(), Core::EditorManager::DoNotMakeVisible); } ModelNode rootModelNode = currentDesignDocument()->rewriterView()->rootModelNode(); applyProperties(rootModelNode, propertyHash);