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

Merge remote-tracking branch 'origin/master' into 10.0

Browse Source 
Change-Id: I9f6090e2a9f62fd3a9823f5a7342ea423dfbb2ac
This commit is contained in:
David Schulz
2023-02-01 06:22:02 +01:00
parent 4bfdfc2fbc 862f484af5
commit 739d4942e2
56 changed files with 861 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ ToolChain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Ut
return ToolChainKitAspect::toolChain(kit, language);
// Try exact compiler match.
const Utils::FilePath compiler = Utils::FilePath::fromString(compilerPath(flags.front()));
const Utils::FilePath compiler = Utils::FilePath::fromUserInput(compilerPath(flags.front()));
ToolChain *toolchain = ToolChainManager::toolChain([&compiler, &language](const ToolChain *tc) {
return tc->isValid() && tc->language() == language && tc->compilerCommand() == compiler;
});

7
src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp
View File

@@ -157,11 +157,8 @@ static QStringList jsonObjectFlags(const QJsonObject &object, QSet<QString> &fla
static FilePath jsonObjectFilePath(const QJsonObject &object)
{
const QString workingDir = QDir::cleanPath(object["directory"].toString());
FilePath fileName = FilePath::fromString(QDir::cleanPath(object["file"].toString()));
if (fileName.toFileInfo().isRelative())
fileName = FilePath::fromString(QDir::cleanPath(workingDir + "/" + fileName.toString()));
return fileName;
const FilePath workingDir = FilePath::fromUserInput(object["directory"].toString());
return workingDir.resolvePath(object["file"].toString());
}
std::vector<DbEntry> CompilationDbParser::readJsonObjects() const