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

don't push top level pro file twice on stack

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-07-22 17:46:25 +02:00
parent 023affc603
commit 5b7c8848e5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/proparser/profileevaluator.cpp
View File

@@ -790,15 +790,14 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitBeginProFile(ProFile * pr
{ {
PRE(pro); PRE(pro);
m_lineNo = pro->lineNumber(); m_lineNo = pro->lineNumber();
if (m_oldPath.isEmpty()) { m_profileStack.push(pro);
if (m_profileStack.count() == 1) {
// change the working directory for the initial profile we visit, since // change the working directory for the initial profile we visit, since
// that is *the* profile. All the other times we reach this function will be due to // that is *the* profile. All the other times we reach this function will be due to
// include(file) or load(file) // include(file) or load(file)
m_oldPath = QDir::currentPath(); m_oldPath = QDir::currentPath();
m_profileStack.push(pro);
if (m_parsePreAndPostFiles) { if (m_parsePreAndPostFiles) {
const QString mkspecDirectory = propertyValue(QLatin1String("QMAKE_MKSPECS")); const QString mkspecDirectory = propertyValue(QLatin1String("QMAKE_MKSPECS"));
if (!mkspecDirectory.isEmpty()) { if (!mkspecDirectory.isEmpty()) {
@@ -830,7 +829,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitEndProFile(ProFile * pro)
{ {
PRE(pro); PRE(pro);
m_lineNo = pro->lineNumber(); m_lineNo = pro->lineNumber();
if (m_profileStack.count() == 1 && !m_oldPath.isEmpty()) { if (m_profileStack.count() == 1) {
if (m_parsePreAndPostFiles) { if (m_parsePreAndPostFiles) {
evaluateFeatureFile(QLatin1String("default_post.prf")); evaluateFeatureFile(QLatin1String("default_post.prf"));
@@ -861,9 +860,12 @@ ProItem::ProItemReturn ProFileEvaluator::Private::visitEndProFile(ProFile * pro)
m_testFunctions.clear(); m_testFunctions.clear();
m_profileStack.pop(); m_profileStack.pop();
return returnBool(QDir::setCurrent(m_oldPath)); return returnBool(QDir::setCurrent(m_oldPath));
} }
m_profileStack.pop();
return ProItem::ReturnTrue; return ProItem::ReturnTrue;
} }
@@ -2380,9 +2382,7 @@ bool ProFileEvaluator::Private::evaluateFile(const QString &fileName)
{ {
ProFile *pro = q->parsedProFile(fileName); ProFile *pro = q->parsedProFile(fileName);
if (pro) { if (pro) {
m_profileStack.push(pro);
bool ok = (pro->Accept(this) == ProItem::ReturnTrue); bool ok = (pro->Accept(this) == ProItem::ReturnTrue);
m_profileStack.pop();
q->releaseParsedProFile(pro); q->releaseParsedProFile(pro);
return ok; return ok;
} else { } else {