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

blow away the -$VAR hack again, now that things Just Work (TM)

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-03-11 16:19:50 +01:00
parent 1ed3298ae2
commit a429d7a5e2
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -781,18 +781,9 @@ bool ProFileEvaluator::Private::visitProValue(ProValue *value)
case ProVariable::RemoveOperator: // -=
if (!m_cumulative) {
if (!m_skipLevel) {
// the insertUnique is a hack for the moment to fix the
// CONFIG -= app_bundle problem on Mac (add it to a variable -CONFIG as was done before)
if (removeEach(&m_tempValuemap, varName, v) == 0)
insertUnique(&m_tempValuemap, QString("-%1").arg(varName), v);
if (removeEach(&m_tempFilevaluemap[currentProFile()], varName, v) == 0)
insertUnique(&m_tempFilevaluemap[currentProFile()], QString("-%1").arg(varName), v);
removeEach(&m_tempValuemap, varName, v);
removeEach(&m_tempFilevaluemap[currentProFile()], varName, v);
}
} else if (!m_skipLevel) {
// the insertUnique is a hack for the moment to fix the
// CONFIG -= app_bundle problem on Mac (add it to a variable -CONFIG as was done before)
insertUnique(&m_tempValuemap, QString("-%1").arg(varName), v);
insertUnique(&m_tempFilevaluemap[currentProFile()], QString("-%1").arg(varName), v);
} else {
// We are stingy with our values, too.
}