OSDN Git Service

consolidate the subdir name data path
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tue, 8 Jun 2010 12:02:15 +0000 (14:02 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 9 Jun 2010 09:46:10 +0000 (11:46 +0200)
every path should be separator-fixed

Reviewed-by: dt
src/plugins/qt4projectmanager/qt4nodes.cpp

index 52d0e04..f803b16 100644 (file)
@@ -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()) {