diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 09:19:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-04 09:19:28 +0200 |
| commit | c868b9f3ed1bbd499195e158f44cb51f093a0177 (patch) | |
| tree | dc1fcae11aa4c66bc17fa359299196652b9f2e8d /src/plugins/cmakeprojectmanager | |
| parent | 2ffe1ac68f878011cad534cffe0e983b428f6f14 (diff) | |
| parent | e873f872ef2a2ba1342dd013ab2e184e6676a71a (diff) | |
| download | qt-creator-c868b9f3ed1bbd499195e158f44cb51f093a0177.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeproject.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index 4aeeb44014..aa231d5e30 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -467,6 +467,8 @@ ProjectExplorer::FolderNode *CMakeProject::findOrCreateFolder(CMakeProjectNode * FileName path = rootNode->path().parentDir(); QDir rootParentDir(path.toString()); QString relativePath = rootParentDir.relativeFilePath(directory); + if (relativePath == QLatin1String(".")) + relativePath.clear(); QStringList parts = relativePath.split(QLatin1Char('/'), QString::SkipEmptyParts); ProjectExplorer::FolderNode *parent = rootNode; foreach (const QString &part, parts) { |