diff options
| author | David Schulz <david.schulz@qt.io> | 2023-02-01 06:22:02 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2023-02-01 05:24:33 +0000 |
| commit | 739d4942e2ed35fe92f11310d80632aa288fa44c (patch) | |
| tree | 45fec72539b6fa46234caaf4a88005461c220d39 /src/plugins/compilationdatabaseprojectmanager | |
| parent | 4bfdfc2fbc535f3ca7508a7a7c95356b8c528d08 (diff) | |
| parent | 862f484af59cea06b99a743316c2ffcc0a252686 (diff) | |
Merge remote-tracking branch 'origin/master' into 10.0
Change-Id: I9f6090e2a9f62fd3a9823f5a7342ea423dfbb2ac
Diffstat (limited to 'src/plugins/compilationdatabaseprojectmanager')
| -rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index bf61ee848dd..2606791942f 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -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; }); diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp index 01ec506c27a..bf5ff01e2ae 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp @@ -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 |