Commit a429d7a5 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

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

parent 1ed3298a
......@@ -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.
}
......
......@@ -136,14 +136,12 @@ static void insertUnique(QHash<QString, QStringList> *map,
sl.append(str);
}
static int removeEach(QHash<QString, QStringList> *map,
static void removeEach(QHash<QString, QStringList> *map,
const QString &key, const QStringList &value)
{
int count = 0;
QStringList &sl = (*map)[key];
foreach (const QString &str, value)
count += sl.removeAll(str);
return count;
sl.removeAll(str);
}
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment