diff options
| author | Martin Kampas <martin.kampas@jolla.com> | 2020-09-29 15:07:28 +0200 |
|---|---|---|
| committer | Martin Kampas <martin.kampas+qt@ubedi.net> | 2020-10-02 12:33:25 +0000 |
| commit | 10c0cdc10f6b6f04d15cbdadc44fd30b5e7c2555 (patch) | |
| tree | 639e2a811f3741b389e6113a3af61c8c08b8d637 /src/plugins/compilationdatabaseprojectmanager | |
| parent | 7125406305a97c46fc64664819211e53ff242ceb (diff) | |
CompilationDatabase: Clean paths
File paths in compile_database.json may contain redundant components
("./" or "../"). These confuse the code model, which then fails to
associate the document with the project node.
Change-Id: I7c74a24789a67b761b0737a41d1dd70d2dfd5f3d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/compilationdatabaseprojectmanager')
| -rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp index 7b498ab957d..f99498f3a76 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdbparser.cpp @@ -167,8 +167,8 @@ static QStringList jsonObjectFlags(const QJsonObject &object, QSet<QString> &fla static FilePath jsonObjectFilename(const QJsonObject &object) { - const QString workingDir = QDir::fromNativeSeparators(object["directory"].toString()); - FilePath fileName = FilePath::fromString(QDir::fromNativeSeparators(object["file"].toString())); + 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; |