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

remove evaluation of pro file before changing it

Browse Source 
just parsing it (once ...) ought to be sufficient. we don't need to
validate the syntax beyond that anyway.
This commit is contained in:
Oswald Buddenhagen
2010-01-14 21:51:34 +01:00
parent ea9c5efa15
commit 69028643b2
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -638,15 +638,11 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
return;
ProFileReader *reader = m_project->createProFileReader(m_qt4ProFileNode);
if (!reader->readProFile(m_qt4ProFileNode->path())) {
m_project->proFileParseError(tr("Error while parsing file %1. Giving up.").arg(m_projectFilePath));
m_project->destroyProFileReader(reader);
return;
}
ProFile *includeFile = reader->proFileFor(m_projectFilePath);
ProFile *includeFile = reader->parsedProFile(m_projectFilePath);
m_project->destroyProFileReader(reader);
if (!includeFile) {
m_project->proFileParseError(tr("Error while changing pro file %1.").arg(m_projectFilePath));
return;
}
const QStringList vars = varNames(fileType);
@@ -717,7 +713,8 @@ void Qt4PriFileNode::changeFiles(const FileType fileType,
// save file
save(includeFile);
m_project->destroyProFileReader(reader);
includeFile->deref();
}
void Qt4PriFileNode::save(ProFile *includeFile)