diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2012-09-21 15:05:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-08 11:14:28 +0200 |
| commit | 983badb1dc8f3ff3b2e47f5312b2ade385de3fb1 (patch) | |
| tree | 551eb4938173590a331ee044c18c680166265edb /src/tools/qdoc/location.cpp | |
| parent | e4a6f44ce1a35986c445c40ff2793456782f58fa (diff) | |
Fix a bug in how paths are made canonical and relative
Change-Id: Id9b2de9097cab4520882b48a28fccd382c5e076d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/location.cpp')
| -rw-r--r-- | src/tools/qdoc/location.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/location.cpp b/src/tools/qdoc/location.cpp index 40c8cc8e73..942fc0f70c 100644 --- a/src/tools/qdoc/location.cpp +++ b/src/tools/qdoc/location.cpp @@ -238,7 +238,7 @@ QString Location::fileName() const */ QString Location::canonicalRelativePath(const QString &path) const { - QDir configFileDir(QFileInfo(filePath()).dir()); + QDir configFileDir(QDir::current()); QDir dir(path); const QString canon = dir.canonicalPath(); return configFileDir.relativeFilePath(canon); |