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

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

Browse Source 
Task:     Reported by eskil on irc.
This commit is contained in:
qtc-commiter@nokia.com
2008-12-03 13:25:19 +01:00
committed by dt
parent f8def2e26b
commit 6bc0da69af
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/profilereader.cpp
View File

@@ -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;

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -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