diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index a7705075990..8a08aaf055f 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -225,7 +225,7 @@ void QmlDesignerPlugin::showDesigner() void QmlDesignerPlugin::hideDesigner() { if (currentDesignDocument() - && currentDesignDocument()->currentModel() + && currentModel() && !currentDesignDocument()->hasQmlSyntaxErrors()) jumpTextCursorToSelectedModelNode(); @@ -343,7 +343,7 @@ void QmlDesignerPlugin::deactivateAutoSynchronization() void QmlDesignerPlugin::resetModelSelection() { - if (rewriterView() && currentDesignDocument()->currentModel()) + if (rewriterView() && currentModel()) rewriterView()->setSelectedModelNodes(QList()); } @@ -352,6 +352,11 @@ RewriterView *QmlDesignerPlugin::rewriterView() const return currentDesignDocument()->rewriterView(); } +Model *QmlDesignerPlugin::currentModel() const +{ + return currentDesignDocument()->currentModel(); +} + static bool checkIfEditorIsQtQuick(Core::IEditor *editor) { if (editor) diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h index 9a96b8400ef..ace422bf926 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.h +++ b/src/plugins/qmldesigner/qmldesignerplugin.h @@ -114,6 +114,7 @@ private: // functions void deactivateAutoSynchronization(); void resetModelSelection(); RewriterView *rewriterView() const; + Model *currentModel() const; private: // variables QmlDesignerPluginData *data;