aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Otto <totto@zbh.uni-hamburg.de>2012-12-13 12:11:31 +0100
committerTobias Hunger <tobias.hunger@digia.com>2012-12-13 13:38:56 +0100
commit6d83dda6df643eca4c720cb474cc5636d8e60ff5 (patch)
tree7ce02d97fa54922610389f67a23e5f02d49a866d /src
parent0b777b00527dd6d5ca0fb325da7bd004a5fec690 (diff)
GenericProject: remove trailing "/" from .includes paths
Paths in the .includes file are user edited and may contain trailing slashes. If these are not filtered out, the CppCompletionAssistProcessor suggestions are missing the first character (e.g. rc/, not src/). Change-Id: I19b4c811d504042d0a4eb4ee8961818b3e17051c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/genericprojectmanager/genericproject.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 650c6094e8..52f56c1a11 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -330,6 +330,8 @@ QStringList GenericProject::processEntries(const QStringList &paths,
expandEnvironmentVariables(env, trimmedPath);
+ trimmedPath = Utils::FileName::fromUserInput(trimmedPath).toString();
+
const QString absPath = QFileInfo(projectDir, trimmedPath).absoluteFilePath();
absolutePaths.append(absPath);
if (map)