Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1

5 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index c2a48ea89f..a90e4d8bd7 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -132,12 +132,12 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
     addAction(m_selectOnlyContentItemsAction.data());
     upperActions.append(m_selectOnlyContentItemsAction.data());
 
-    m_rootWidthAction = new LineEditAction("width", this);
+    m_rootWidthAction = new LineEditAction(tr("width"), this);
     connect(m_rootWidthAction.data(), SIGNAL(textChanged(QString)), this, SLOT(changeRootItemWidth(QString)));
     addAction(m_rootWidthAction.data());
     upperActions.append(m_rootWidthAction.data());
 
-    m_rootHeightAction =  new LineEditAction("height", this);
+    m_rootHeightAction =  new LineEditAction(tr("height"), this);
     connect(m_rootHeightAction.data(), SIGNAL(textChanged(QString)), this, SLOT(changeRootItemHeight(QString)));
     addAction(m_rootHeightAction.data());
     upperActions.append(m_rootHeightAction.data());
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 1a47517977..482aea9656 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;
     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 4b1f4a350c..a77facd865 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 e0b01c7b47..ade173a2f0 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 57a55f687e..84b20a9b12 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(); }
 
     const QmlJS::Document *document() const
     { return m_document.data(); }