diff options
-rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp | 10 | ||||
-rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index d5362c177f..5f280b19f7 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)}); } -static FilePath rootPathFromSettings(const FilePath &projectDirectory) +Utils::FilePath CompilationDatabaseProject::rootPathFromSettings() const { #ifdef WITH_TESTS - return FilePath::fromString(projectDirectory.fileName()); + return Utils::FilePath::fromString(projectDirectory().fileName()); #else - return FilePath::fromString( + return Utils::FilePath::fromString( namedSettings(ProjectExplorer::Constants::PROJECT_ROOT_PATH_KEY).toString()); #endif } @@ -465,9 +465,7 @@ void CompilationDatabaseBuildSystem::reparseProject() QTC_CHECK(isParsing()); m_parser->stop(); } - - const FilePath rootPath = rootPathFromSettings(projectDirectory()); - + const FilePath rootPath = static_cast<CompilationDatabaseProject *>(project())->rootPathFromSettings(); m_parser = new CompilationDbParser(project()->displayName(), projectFilePath(), rootPath, diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h index 3a67bafc9b..463126a5a3 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h @@ -58,6 +58,7 @@ public: bool needsConfiguration() const override { return false; } + Utils::FilePath rootPathFromSettings() const; ProjectExplorer::Kit *kit() const { return m_kit.get(); } private: |