diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2012-10-17 15:46:54 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-10-22 16:08:30 +0200 |
| commit | 8c980f5a4eccc4eff92a1b0db169277bde149e5c (patch) | |
| tree | 3011bc5da38ed9668c594e4d835688ddcfaf83c3 /src/plugins/coreplugin/vcsmanager.cpp | |
| parent | a1e3a5de9ee9b2d4b068ff3568aea8594d1aea65 (diff) | |
| download | qt-creator-8c980f5a4eccc4eff92a1b0db169277bde149e5c.tar.gz | |
VCS: Work with canonical paths when looking for toplevel directories
Change-Id: I2b2f3f76f04af298dcc6f38e1c5f1dd4555e2024
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/coreplugin/vcsmanager.cpp')
| -rw-r--r-- | src/plugins/coreplugin/vcsmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp index ec9cda5e6c..0418014f27 100644 --- a/src/plugins/coreplugin/vcsmanager.cpp +++ b/src/plugins/coreplugin/vcsmanager.cpp @@ -209,7 +209,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input return 0; // Make sure we a clean absolute path: - const QString directory = QDir(inputDirectory).absolutePath(); + const QString directory = QDir(inputDirectory).canonicalPath(); VcsManagerPrivate::VcsInfo *cachedData = d->findInCache(directory); if (cachedData) { @@ -242,7 +242,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input } // Register Vcs(s) with the cache - QString tmpDir = directory; + QString tmpDir = QFileInfo(directory).canonicalFilePath(); const QChar slash = QLatin1Char('/'); const StringVersionControlPairs::const_iterator cend = allThatCanManage.constEnd(); for (StringVersionControlPairs::const_iterator i = allThatCanManage.constBegin(); i != cend; ++i) { |