feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GenericProject: Use Utils::FileName for childOf check

Browse Source 
Using startsWith is wrong

Change-Id: Ib54c62006994e0657576845066ce8ba9d15d2138
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2012-10-24 15:21:41 +02:00
parent 0a1bdf4257
commit dc9f59999b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/genericprojectmanager/genericprojectnodes.cpp
View File

@@ -94,14 +94,14 @@ void GenericProjectNode::refresh()
foreach (const QString &absoluteFileName, files) { foreach (const QString &absoluteFileName, files) {
QFileInfo fileInfo(absoluteFileName); QFileInfo fileInfo(absoluteFileName);
const QString absoluteFilePath = fileInfo.path(); Utils::FileName absoluteFilePath = Utils::FileName::fromString(fileInfo.path());
QString relativeFilePath; QString relativeFilePath;
if (absoluteFilePath.startsWith(base)) { if (absoluteFilePath.isChildOf(baseDir)) {
relativeFilePath = absoluteFilePath.mid(base.length() + 1); relativeFilePath = absoluteFilePath.relativeChildPath(Utils::FileName::fromString(base)).toString();
} else { } else {
// `file' is not part of the project. // `file' is not part of the project.
relativeFilePath = baseDir.relativeFilePath(absoluteFilePath); relativeFilePath = baseDir.relativeFilePath(absoluteFilePath.toString());
} }
if (! filePaths.contains(relativeFilePath)) if (! filePaths.contains(relativeFilePath))