From d08cbf664151cd9a083e6779dbcb854e0ee2bbaf Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 10 Mar 2017 17:21:34 +0100 Subject: [PATCH] CMake: Fix empty display name when opening project Change-Id: Id89177f6502c7f4f8bb121acefe3f3efca82828f Reviewed-by: hjk --- src/plugins/cmakeprojectmanager/cmakeproject.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 228580c1e50..1ecc0c6e5ee 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -77,8 +77,9 @@ CMakeProject::CMakeProject(const FileName &fileName) : m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)) { setId(CMakeProjectManager::Constants::CMAKEPROJECT_ID); - setDocument(new TextEditor::TextDocument); - document()->setFilePath(fileName); + auto doc = new TextEditor::TextDocument; + doc->setFilePath(fileName); + setDocument(doc); setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT)); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); @@ -302,9 +303,8 @@ bool CMakeProject::hasBuildTarget(const QString &title) const QString CMakeProject::displayName() const { - if (!rootProjectNode()) - return projectDirectory().fileName(); - return rootProjectNode()->displayName(); + auto root = dynamic_cast(rootProjectNode()); + return root ? root->displayName() : projectDirectory().fileName(); } QStringList CMakeProject::files(FilesMode fileMode) const