From a791ee41541808f68767e398740fb99b986c1419 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 17 Nov 2011 14:49:26 +0100 Subject: QmlDesigner: crash fix Task-number: QTCREATORBUG-6558 Change-Id: I5e5719c7764df350f4e466b8f1e90bdeed872b3d Reviewed-by: Eike Ziller Reviewed-by: Alessandro Portale --- src/plugins/qmldesigner/designercore/include/rewriterview.h | 2 +- src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 4 ++-- src/plugins/qmldesigner/designercore/model/rewriterview.cpp | 2 +- src/plugins/qmldesigner/designercore/model/texttomodelmerger.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index 5051bc802a..b0dac4eae4 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -187,8 +187,8 @@ public: bool renameId(const QString& oldId, const QString& newId); - const QmlJS::ScopeChain &scopeChain() const; QmlJS::Document *document() const; + const QmlJS::ScopeChain *scopeChain() const; QString convertTypeToImportAlias(const QString &type) const; diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 3bcfcdcdff..c6c0c80a44 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -490,8 +490,8 @@ const QmlJS::ObjectValue *NodeMetaInfoPrivate::getObjectValue() const QmlJS::ContextPtr NodeMetaInfoPrivate::context() const { - if (m_model && m_model->rewriterView()) { - return m_model->rewriterView()->scopeChain().context(); + if (m_model && m_model->rewriterView() && m_model->rewriterView()->scopeChain()) { + return m_model->rewriterView()->scopeChain()->context(); } return QmlJS::ContextPtr(0); } diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index c106cc89e6..86f78a52da 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -624,7 +624,7 @@ bool RewriterView::renameId(const QString& oldId, const QString& newId) return false; } -const QmlJS::ScopeChain &RewriterView::scopeChain() const +const QmlJS::ScopeChain *RewriterView::scopeChain() const { return textToModelMerger()->scopeChain(); } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index 84e13d53b7..8509353bb5 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -68,8 +68,8 @@ public: RewriterView *view() const { return m_rewriterView; } - const QmlJS::ScopeChain &scopeChain() const - { return *m_scopeChain; } + const QmlJS::ScopeChain *scopeChain() const + { return m_scopeChain.data(); } QmlJS::Document *document() const { return m_document.data(); } -- cgit v1.2.1