Commit 6bc0da69 authored by qtc-commiter@nokia.com's avatar qtc-commiter@nokia.com Committed by dt

Fixes: Fix crash on windows while loading projects.pro.

Task:     Reported by eskil on irc.
parent f8def2e2
...@@ -69,7 +69,7 @@ bool ProFileReader::readProFile(const QString &fileName) ...@@ -69,7 +69,7 @@ bool ProFileReader::readProFile(const QString &fileName)
// return false; // return false;
// } // }
// } // }
QString fn = QFileInfo(fileName).filePath(); QString fn = QFileInfo(fileName).filePath();
ProFile *pro = new ProFile(fn); ProFile *pro = new ProFile(fn);
if (!queryProFile(pro)) { if (!queryProFile(pro)) {
delete pro; delete pro;
......
...@@ -883,12 +883,12 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const ...@@ -883,12 +883,12 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
QString realFile; QString realFile;
const QString subDirKey = subDirVar + QLatin1String(".subdir"); const QString subDirKey = subDirVar + QLatin1String(".subdir");
if (reader->contains(subDirKey)) if (reader->contains(subDirKey))
realDir = reader->value(subDirKey); realDir = QFileInfo(reader->value(subDirKey)).filePath();
else else
realDir = subDirVar; realDir = subDirVar;
QFileInfo info(realDir); QFileInfo info(realDir);
if (!info.isAbsolute()) if (!info.isAbsolute())
realDir = QString("%1/%2").arg(m_projectDir, realDir); realDir = m_projectDir + "/" + realDir;
#ifdef QTEXTENDED_QBUILD_SUPPORT #ifdef QTEXTENDED_QBUILD_SUPPORT
// QBuild only uses project files named qbuild.pro, and subdirs are implied // QBuild only uses project files named qbuild.pro, and subdirs are implied
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment