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

surround file inclusion with saving/restoring condition state

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-05-14 14:36:37 +02:00
parent ed00bd2c85
commit a86bdfdde4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1782,7 +1782,10 @@ bool ProFileEvaluator::Private::evaluateConditionalFunction(
// ### this breaks if we have include(c:/reallystupid.pri) but IMHO that's really bad style. // ### this breaks if we have include(c:/reallystupid.pri) but IMHO that's really bad style.
QDir currentProPath(currentDirectory()); QDir currentProPath(currentDirectory());
fileName = QDir::cleanPath(currentProPath.absoluteFilePath(fileName)); fileName = QDir::cleanPath(currentProPath.absoluteFilePath(fileName));
return evaluateFile(fileName); State sts = m_sts;
bool ok = evaluateFile(fileName);
m_sts = sts;
return ok;
} }
case T_LOAD: { case T_LOAD: {
if (m_skipLevel && !m_cumulative) if (m_skipLevel && !m_cumulative)