diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index dc19e635320364ebf8903eeca0f0d16278befd28..1f43db90f622e0b1270c333335a43af0ad858acc 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -392,7 +392,6 @@ void DesignDocument::activateCurrentModel(TextModifier *textModifier) // m_formEditorView->crumblePath()->pushElement(simplfiedDisplayName(), createCrumbleBarInfo()); m_documentLoaded = true; - m_subComponentManager->update(QUrl::fromLocalFile(fileName()), m_currentModel->imports()); Q_ASSERT(m_documentModel); QApplication::restoreOverrideCursor(); } @@ -407,6 +406,7 @@ void DesignDocument::activateCurrentModel() void DesignDocument::activateDocumentModel() { + //this function seems to be unused! QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); Q_ASSERT(m_documentModel); @@ -417,7 +417,9 @@ void DesignDocument::activateDocumentModel() m_currentModel = m_documentModel; m_documentLoaded = true; - m_subComponentManager->update(QUrl::fromLocalFile(fileName()), m_currentModel->imports()); + + updateSubcomponentManager(); + Q_ASSERT(m_documentModel); QApplication::restoreOverrideCursor(); } @@ -443,6 +445,12 @@ void DesignDocument::close() emit designDocumentClosed(); } +void DesignDocument::updateSubcomponentManager() +{ + Q_ASSERT(m_subComponentManager); + m_subComponentManager->update(QUrl::fromLocalFile(fileName()), m_currentModel->imports()); +} + void DesignDocument::deleteSelected() { if (!m_currentModel) diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h index bf89161c36d5ec16e0ae96b45832498eed33dbb1..7a738945ad7d189a8e3f40ca13374f5ccb769180 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.h +++ b/src/plugins/qmldesigner/components/integration/designdocument.h @@ -82,6 +82,7 @@ public: void activateCurrentModel(); void activateDocumentModel(); void close(); + void updateSubcomponentManager(); bool isUndoAvailable() const; bool isRedoAvailable() const; diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index abd3d9c67d13c93d0475664440a42ba992c94ae8..8468ce3db8116bcf22d7bc459c236a4c3bd6e888 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -302,6 +302,7 @@ void QmlDesignerPlugin::activateAutoSynchronization() m_mainWidget->showErrorMessage(errors); } + currentDesignDocument()->updateSubcomponentManager(); connect(currentDesignDocument()->rewriterView(), SIGNAL(errorsChanged(QList)),