feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Fix empty display name when opening project

Browse Source 
Change-Id: Id89177f6502c7f4f8bb121acefe3f3efca82828f
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-10 17:21:34 +01:00
parent 86fde306d1
commit d08cbf6641
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -77,8 +77,9 @@ CMakeProject::CMakeProject(const FileName &fileName)
: m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this)) : m_cppCodeModelUpdater(new CppTools::CppProjectUpdater(this))
{ {
setId(CMakeProjectManager::Constants::CMAKEPROJECT_ID); setId(CMakeProjectManager::Constants::CMAKEPROJECT_ID);
setDocument(new TextEditor::TextDocument); auto doc = new TextEditor::TextDocument;
document()->setFilePath(fileName); doc->setFilePath(fileName);
setDocument(doc);
setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT)); setProjectContext(Core::Context(CMakeProjectManager::Constants::PROJECTCONTEXT));
setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
@@ -302,9 +303,8 @@ bool CMakeProject::hasBuildTarget(const QString &title) const
QString CMakeProject::displayName() const QString CMakeProject::displayName() const
{ {
if (!rootProjectNode()) auto root = dynamic_cast<CMakeProjectNode *>(rootProjectNode());
return projectDirectory().fileName(); return root ? root->displayName() : projectDirectory().fileName();
return rootProjectNode()->displayName();
} }
QStringList CMakeProject::files(FilesMode fileMode) const QStringList CMakeProject::files(FilesMode fileMode) const