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

Revert "CompilationDatabase: Simplify rootPathFromSettings function call"

Browse Source 
This reverts commit ad729a4085.

This breaks non-test builds. namedSettings() is a non-static in Project.

Change-Id: I1675cddfd515a021482769d38092138dbaa055ee
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
hjk
2020-01-07 16:25:09 +01:00
parent a0c7022b33
commit c832f61e36
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -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,

1
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.h
View File

@@ -58,6 +58,7 @@ public:
bool needsConfiguration() const override { return false; }
Utils::FilePath rootPathFromSettings() const;
ProjectExplorer::Kit *kit() const { return m_kit.get(); }
private: