diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 0c25e7adf48876f0e942c6e5ec3ec39243e92af8..46afd75f2c99d5a8308d697fcf27d3a05c43226f 100644 --- 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 2f15ad8e07a24b46dbdb70c18c1e05b35fd68807..e0930394c536fed46e684196e3b774f527ce4636 100644 --- 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;