From 6a6e0091c8dc143de5ca4a53ee7b81caaf5df6bf Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 8 Jun 2010 14:02:15 +0200
Subject: [PATCH] consolidate the subdir name data path
every path should be separator-fixed
Reviewed-by: dt
---
src/plugins/qt4projectmanager/qt4nodes.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 52d0e043cd3..f803b16ea8a 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -1425,16 +1425,15 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
const QString subDirKey = subDirVar + QLatin1String(".subdir");
const QString subDirFileKey = subDirVar + QLatin1String(".file");
if (reader->contains(subDirKey))
- realDir = QFileInfo(reader->value(subDirKey)).filePath();
+ realDir = reader->value(subDirKey);
else if (reader->contains(subDirFileKey))
- realDir = QFileInfo(reader->value(subDirFileKey)).filePath();
+ realDir = reader->value(subDirFileKey);
else
realDir = subDirVar;
QFileInfo info(realDir);
- if (!info.isAbsolute()) {
+ if (!info.isAbsolute())
info.setFile(m_projectDir + QLatin1Char('/') + realDir);
- realDir = m_projectDir + QLatin1Char('/') + realDir;
- }
+ realDir = info.filePath();
QString realFile;
if (info.isDir()) {
--
GitLab