diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
index cecb5a478a4..383279bcf4b 100644
--- a/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/crumblebar.cpp
@@ -63,7 +63,7 @@ static CrumbleBarInfo createCrumbleBarInfoFromModelNode(const ModelNode &modelNo
 {
     CrumbleBarInfo crumbleBarInfo;
     crumbleBarInfo.displayName = componentIdForModelNode(modelNode);
-    crumbleBarInfo.fileName = currentDesignDocument()->textEditor()->document()->filePath().toString();
+    crumbleBarInfo.fileName = currentDesignDocument()->textEditor()->document()->filePath();
     crumbleBarInfo.modelNode = modelNode;
 
     return crumbleBarInfo;
@@ -87,7 +87,7 @@ CrumbleBar::~CrumbleBar()
     delete m_crumblePath;
 }
 
-void CrumbleBar::pushFile(const QString &fileName)
+void CrumbleBar::pushFile(const Utils::FileName &fileName)
 {
     if (m_isInternalCalled == false) {
         crumblePath()->clear();
@@ -102,7 +102,7 @@ void CrumbleBar::pushFile(const QString &fileName)
     CrumbleBarInfo crumbleBarInfo;
     crumbleBarInfo.fileName = fileName;
 
-    crumblePath()->pushElement(fileName.split(QLatin1String("/")).last(), QVariant::fromValue(crumbleBarInfo));
+    crumblePath()->pushElement(fileName.fileName(), QVariant::fromValue(crumbleBarInfo));
 
     m_isInternalCalled = false;
 
@@ -171,7 +171,7 @@ void CrumbleBar::onCrumblePathElementClicked(const QVariant &data)
 
     m_isInternalCalled = true;
     if (!clickedCrumbleBarInfo.modelNode.isValid()
-            && Utils::FileName::fromString(clickedCrumbleBarInfo.fileName) == currentDesignDocument()->fileName()) {
+            && clickedCrumbleBarInfo.fileName == currentDesignDocument()->fileName()) {
         nextFileIsCalledInternally();
         currentDesignDocument()->changeToDocumentModel();
         QmlDesignerPlugin::instance()->viewManager().setComponentViewToMaster();
@@ -179,8 +179,8 @@ void CrumbleBar::onCrumblePathElementClicked(const QVariant &data)
         showSaveDialog();
         crumblePath()->popElement();
         nextFileIsCalledInternally();
-        Core::EditorManager::openEditor(clickedCrumbleBarInfo.fileName, Core::Id(),
-                                        Core::EditorManager::DoNotMakeVisible);
+        Core::EditorManager::openEditor(clickedCrumbleBarInfo.fileName.toString(),
+            Core::Id(), Core::EditorManager::DoNotMakeVisible);
         if (clickedCrumbleBarInfo.modelNode.isValid()) {
             currentDesignDocument()->changeToSubComponent(clickedCrumbleBarInfo.modelNode);
             QmlDesignerPlugin::instance()->viewManager().setComponentNode(clickedCrumbleBarInfo.modelNode);
diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.h b/src/plugins/qmldesigner/components/componentcore/crumblebar.h
index a09f2e3b4fc..3cfef61c740 100644
--- a/src/plugins/qmldesigner/components/componentcore/crumblebar.h
+++ b/src/plugins/qmldesigner/components/componentcore/crumblebar.h
@@ -27,6 +27,7 @@
 
 #include <QObject>
 #include <utils/crumblepath.h>
+#include <utils/fileutils.h>
 #include <modelnode.h>
 
 namespace QmlDesigner {
@@ -38,7 +39,7 @@ public:
     explicit CrumbleBar(QObject *parent = 0);
     ~CrumbleBar();
 
-    void pushFile(const QString &fileName);
+    void pushFile(const Utils::FileName &fileName);
     void pushInFileComponent(const ModelNode &modelNode);
 
     void nextFileIsCalledInternally();
@@ -59,7 +60,7 @@ private:
 
 class CrumbleBarInfo {
 public:
-    QString fileName;
+    Utils::FileName fileName;
     QString displayName;
     ModelNode modelNode;
 };
diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp
index 2d32dc358f9..7004107a645 100644
--- a/src/plugins/qmldesigner/components/integration/designdocument.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp
@@ -321,7 +321,7 @@ void DesignDocument::changeToMaster()
     if (m_inFileComponentModel)
         changeToDocumentModel();
 
-    QmlDesignerPlugin::instance()->viewManager().pushFileOnCrumbleBar(fileName().toString());
+    QmlDesignerPlugin::instance()->viewManager().pushFileOnCrumbleBar(fileName());
     QmlDesignerPlugin::instance()->viewManager().setComponentNode(rootModelNode());
 }
 
diff --git a/src/plugins/qmldesigner/designercore/include/viewmanager.h b/src/plugins/qmldesigner/designercore/include/viewmanager.h
index 3304e7e5a93..5270933468e 100644
--- a/src/plugins/qmldesigner/designercore/include/viewmanager.h
+++ b/src/plugins/qmldesigner/designercore/include/viewmanager.h
@@ -29,6 +29,8 @@
 
 #include <QWidgetAction>
 
+#include <utils/fileutils.h>
+
 namespace ProjectExplorer {
 class Kit;
 class Project;
@@ -76,7 +78,7 @@ public:
     void disableWidgets();
     void enableWidgets();
 
-    void pushFileOnCrumbleBar(const QString &fileName);
+    void pushFileOnCrumbleBar(const Utils::FileName &fileName);
     void pushInFileComponentOnCrumbleBar(const ModelNode &modelNode);
     void nextFileIsCalledInternally();
 
diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
index cdf44e06064..5056666456f 100644
--- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
@@ -267,7 +267,7 @@ void ViewManager::enableWidgets()
         widgetInfo.widget->setEnabled(true);
 }
 
-void ViewManager::pushFileOnCrumbleBar(const QString &fileName)
+void ViewManager::pushFileOnCrumbleBar(const Utils::FileName &fileName)
 {
     crumbleBar()->pushFile(fileName);
 }
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index fe976e2851d..b162816ebdd 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -452,7 +452,7 @@ ViewManager &DesignModeWidget::viewManager()
 void DesignModeWidget::setupNavigatorHistory(Core::IEditor *editor)
 {
     if (!m_keepNavigatorHistory)
-        addNavigatorHistoryEntry(editor->document()->filePath().toString());
+        addNavigatorHistoryEntry(editor->document()->filePath());
 
     const bool canGoBack = m_navigatorHistoryCounter > 0;
     const bool canGoForward = m_navigatorHistoryCounter < (m_navigatorHistory.size() - 1);
@@ -461,12 +461,12 @@ void DesignModeWidget::setupNavigatorHistory(Core::IEditor *editor)
     m_toolBar->setCurrentEditor(editor);
 }
 
-void DesignModeWidget::addNavigatorHistoryEntry(const QString &fileName)
+void DesignModeWidget::addNavigatorHistoryEntry(const Utils::FileName &fileName)
 {
     if (m_navigatorHistoryCounter > 0)
-        m_navigatorHistory.insert(m_navigatorHistoryCounter + 1, fileName);
+        m_navigatorHistory.insert(m_navigatorHistoryCounter + 1, fileName.toString());
     else
-        m_navigatorHistory.append(fileName);
+        m_navigatorHistory.append(fileName.toString());
 
     ++m_navigatorHistoryCounter;
 }
diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h
index 86e292a879f..a865bf6105f 100644
--- a/src/plugins/qmldesigner/designmodewidget.h
+++ b/src/plugins/qmldesigner/designmodewidget.h
@@ -101,7 +101,7 @@ private: // functions
     void setup();
     bool isInNodeDefinition(int nodeOffset, int nodeLength, int cursorPos) const;
     QmlDesigner::ModelNode nodeForPosition(int cursorPos) const;
-    void addNavigatorHistoryEntry(const QString &fileName);
+    void addNavigatorHistoryEntry(const Utils::FileName &fileName);
     QWidget *createCenterWidget();
     QWidget *createCrumbleBarFrame();
 
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 27526298deb..b8b45729314 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -274,7 +274,7 @@ void QmlDesignerPlugin::createDesignModeWidget()
     connect(Core::EditorManager::instance(), &Core::EditorManager::editorsClosed, [=] (QList<Core::IEditor*> editors) {
         if (d) {
             if (d->documentManager.hasCurrentDesignDocument()
-                    && editors.contains(d->documentManager.currentDesignDocument()->textEditor()))
+                    && editors.contains(currentDesignDocument()->textEditor()))
                 hideDesigner();
 
             d->documentManager.removeEditors(editors);
@@ -336,7 +336,7 @@ void QmlDesignerPlugin::showDesigner()
     if (d->documentManager.hasCurrentDesignDocument()) {
         activateAutoSynchronization();
         d->shortCutManager.updateActions(currentDesignDocument()->textEditor());
-        d->viewManager.pushFileOnCrumbleBar(d->documentManager.currentDesignDocument()->fileName().toString());
+        d->viewManager.pushFileOnCrumbleBar(currentDesignDocument()->fileName());
     }
 
     d->shortCutManager.updateUndoActions(currentDesignDocument());
@@ -374,7 +374,7 @@ void QmlDesignerPlugin::changeEditor()
 
     if (d->documentManager.hasCurrentDesignDocument()) {
         activateAutoSynchronization();
-        d->viewManager.pushFileOnCrumbleBar(d->documentManager.currentDesignDocument()->fileName().toString());
+        d->viewManager.pushFileOnCrumbleBar(currentDesignDocument()->fileName());
         d->viewManager.setComponentViewToMaster();
     }