diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 5f280b19f71..d5362c177f2 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -449,12 +449,12 @@ CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &pr {projectFile.stringAppended(Constants::COMPILATIONDATABASEPROJECT_FILES_SUFFIX)}); } -Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const +static FilePath rootPathFromSettings(const FilePath &projectDirectory) { #ifdef WITH_TESTS - return Utils::FilePath::fromString(projectDirectory().fileName()); + return FilePath::fromString(projectDirectory.fileName()); #else - return Utils::FilePath::fromString( + return FilePath::fromString( namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString()); #endif } @@ -465,7 +465,9 @@ void CompilationDatabaseBuildSystem::reparseProject() QTC_CHECK(isParsing()); m_parser->stop(); } - const FilePath rootPath = static_cast(project())->rootPathFromSettings(); + + const FilePath rootPath = rootPathFromSettings(projectDirectory()); + m_parser = new CompilationDbParser(project()->displayName(), projectFilePath(), rootPath, diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h index 463126a5a35..3a67bafc9bc 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h @@ -58,7 +58,6 @@ public: bool needsConfiguration() const override { return false; } - Utils::FilePath rootPathFromSettings() const; ProjectExplorer::Kit *kit() const { return m_kit.get(); } private: