diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h index 56b07426769ec4ada6f6e0ccd22850823c230b8a..0da0759e598ba6362cb72b681e8ff334da3be6bf 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h +++ b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h @@ -49,7 +49,7 @@ public: QmlModelNodeFacade(); bool isRootNode() const; - QmlModelView* qmlModelView() const; + static QmlModelView* qmlModelView(); protected: diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp index 994afb60c9a2e3c7e7059ffdffee159e1f0d1e4c..b70f46f955c32f1d37589149718087450f1b455a 100644 --- a/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmlmodelnodefacade.cpp @@ -29,6 +29,7 @@ #include "qmlmodelnodefacade.h" #include "qmlmodelview.h" +#include <qmldesignerplugin.h> #include <QDebug> namespace QmlDesigner { @@ -62,16 +63,14 @@ bool QmlModelNodeFacade::isValid() const return isValidQmlModelNodeFacade(m_modelNode); } -QmlModelView* QmlModelNodeFacade::qmlModelView() const +QmlModelView* QmlModelNodeFacade::qmlModelView() { - return modelNode().view()->toQmlModelView(); + return QmlDesignerPlugin::instance()->viewManager().qmlModelView(); } bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode) { - QmlModelView * qmlModelView = modelNode.view()->toQmlModelView(); - - return modelNode.isValid() && qmlModelView && qmlModelView->nodeInstanceView() && qmlModelView->hasInstanceForModelNode(modelNode) && qmlModelView->instanceForModelNode(modelNode).isValid(); + return modelNode.isValid() && qmlModelView() && qmlModelView()->nodeInstanceView() && qmlModelView()->hasInstanceForModelNode(modelNode) && qmlModelView()->instanceForModelNode(modelNode).isValid(); } bool QmlModelNodeFacade::isRootNode() const