diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
index 2d5e56676b32e9f28fcf177c1b6d24c08733768e..f448e7a860947e81b70941898c08e72106ea594a 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
@@ -85,16 +85,17 @@ void NavigatorView::modelAttached(Model *model)
 
     m_treeModel->setView(this);
 
-    treeWidget()->expandAll();
+    QTreeView *treeView = treeWidget();
+    treeView->expandAll();
 
-    treeWidget()->header()->setResizeMode(0, QHeaderView::Stretch);
-    treeWidget()->header()->resizeSection(1,26);
-    treeWidget()->setRootIsDecorated(false);
-    treeWidget()->setIndentation(20);
+    treeView->header()->setResizeMode(0, QHeaderView::Stretch);
+    treeView->header()->resizeSection(1,26);
+    treeView->setRootIsDecorated(false);
+    treeView->setIndentation(20);
 #ifdef _LOCK_ITEMS_
-    treeWidget()->header()->resizeSection(2,20);
+    treeView->header()->resizeSection(2,20);
 #endif
-    treeWidget()->setHeaderHidden(true);
+    treeView->setHeaderHidden(true);
 }
 
 void NavigatorView::modelAboutToBeDetached(Model *model)
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 95b802df70f2977b5d2a2392d622d937b3d7b7a6..4b387c1423e89378a37fbadf31b71b4388f0c798 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -81,9 +81,4 @@ void NavigatorWidget::setTreeModel(QAbstractItemModel* model)
     m_treeView->setModel(model);
 }
 
-QTreeView *NavigatorWidget::treeView()
-{
-    return m_treeView;
-}
-
 }
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
index b14a5b73394ed164b3261de4d53abd8321d0d721..db864427a92f906e1c366e01c8bb479510e1018e 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h
@@ -47,7 +47,7 @@ public:
     virtual ~NavigatorWidget();
 
     void setTreeModel(QAbstractItemModel *model);
-    QTreeView *treeView();
+    QTreeView *treeView() const { return m_treeView; }
 
 private:
     NavigatorTreeView *m_treeView;