From 6bc0da69af4106bf64f38d286b45654f402d73b7 Mon Sep 17 00:00:00 2001
From: "qtc-commiter@nokia.com" <qtc-commiter@nokia.com>
Date: Wed, 3 Dec 2008 13:25:19 +0100
Subject: [PATCH] Fixes: Fix crash on windows while loading projects.pro.
Task: Reported by eskil on irc.
---
src/plugins/qt4projectmanager/profilereader.cpp | 2 +-
src/plugins/qt4projectmanager/qt4nodes.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/profilereader.cpp b/src/plugins/qt4projectmanager/profilereader.cpp
index 0618fe6c730..0e7dd7ece2a 100644
--- a/src/plugins/qt4projectmanager/profilereader.cpp
+++ b/src/plugins/qt4projectmanager/profilereader.cpp
@@ -69,7 +69,7 @@ bool ProFileReader::readProFile(const QString &fileName)
// return false;
// }
// }
- QString fn = QFileInfo(fileName).filePath();
+ QString fn = QFileInfo(fileName).filePath();
ProFile *pro = new ProFile(fn);
if (!queryProFile(pro)) {
delete pro;
diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp
index 08ebe8aab95..672ce8b835b 100644
--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -883,12 +883,12 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
QString realFile;
const QString subDirKey = subDirVar + QLatin1String(".subdir");
if (reader->contains(subDirKey))
- realDir = reader->value(subDirKey);
+ realDir = QFileInfo(reader->value(subDirKey)).filePath();
else
realDir = subDirVar;
QFileInfo info(realDir);
if (!info.isAbsolute())
- realDir = QString("%1/%2").arg(m_projectDir, realDir);
+ realDir = m_projectDir + "/" + realDir;
#ifdef QTEXTENDED_QBUILD_SUPPORT
// QBuild only uses project files named qbuild.pro, and subdirs are implied
--
GitLab