diff options
author | hjk <[email protected]> | 2019-05-17 13:44:09 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2019-05-20 11:06:12 +0000 |
commit | 36daca80f30aea5b3e335cbbce4c2dbe7c615247 (patch) | |
tree | 2f20849c924c7fb6ab0f65a6604b892391153c1c /src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp | |
parent | 22cd81ffbcb6accd6116064433e554b70272ffe3 (diff) |
Utils: Make FileName::canonicalPath a member
Change-Id: I8d7450dec5c4c14ae3e007d1d66f1a9c3c98f807
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp')
-rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index d10ec35d791..7f3b77a942d 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -181,10 +181,8 @@ Utils::FileName jsonObjectFilename(const QJsonObject &object) const QString workingDir = QDir::fromNativeSeparators(object["directory"].toString()); Utils::FileName fileName = Utils::FileName::fromString( QDir::fromNativeSeparators(object["file"].toString())); - if (fileName.toFileInfo().isRelative()) { - fileName = Utils::FileUtils::canonicalPath( - Utils::FileName::fromString(workingDir + "/" + fileName.toString())); - } + if (fileName.toFileInfo().isRelative()) + fileName = Utils::FileName::fromString(workingDir + "/" + fileName.toString()).canonicalPath(); return fileName; } |