Fixed display of root path and Windows paths in FolderNavigationWidget.

diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 0c25e7a..46afd75 100644 (file)
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -230,7 +230,8 @@ bool FolderNavigationWidget::setCurrentDirectory(const QString &directory)
     }
     m_listView->setRootIndex(m_filterModel->mapFromSource(index));
     const QDir current(QDir::cleanPath(newDirectory));
-    setCurrentTitle(current.dirName(), current.absolutePath());
+    setCurrentTitle(current.dirName(),
+                    QDir::toNativeSeparators(current.absolutePath()));
     return !directory.isEmpty();
 }
 
@@ -267,8 +268,10 @@ void FolderNavigationWidget::openItem(const QModelIndex &srcIndex)
     editorManager->openEditor(m_fileSystemModel->filePath(srcIndex));
 }
 
-void FolderNavigationWidget::setCurrentTitle(const QString &dirName, const QString &fullPath)
+void FolderNavigationWidget::setCurrentTitle(QString dirName, const QString &fullPath)
 {
+    if (dirName.isEmpty())
+        dirName = fullPath;
     m_title->setText(dirName);
     m_title->setToolTip(fullPath);
 }

diff --git a/src/plugins/projectexplorer/foldernavigationwidget.h b/src/plugins/projectexplorer/foldernavigationwidget.h
index 2f15ad8..e093039 100644 (file)
--- a/src/plugins/projectexplorer/foldernavigationwidget.h
+++ b/src/plugins/projectexplorer/foldernavigationwidget.h
@@ -81,7 +81,7 @@ protected:
     virtual void contextMenuEvent(QContextMenuEvent *ev);
 
 private:
-    void setCurrentTitle(const QString &dirName, const QString &fullPath);
+    void setCurrentTitle(QString dirName, const QString &fullPath);
     bool setCurrentDirectory(const QString &directory);
     void openItem(const QModelIndex &srcIndex);
     QModelIndex currentItem() const;