Commit a03f8643 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

make message() & co. handling more qmake-like

which basically means cutting features. heh
parent 88de3e6a
...@@ -2207,20 +2207,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( ...@@ -2207,20 +2207,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
return ProItem::ReturnFalse; return ProItem::ReturnFalse;
} }
QString msg = fixEnvVariables(args.first()); QString msg = fixEnvVariables(args.first());
if (function == QLatin1String("error")) { q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg));
QStringList parents;
foreach (ProFile *proFile, m_profileStack)
parents.append(proFile->fileName());
if (!parents.isEmpty())
parents.takeLast();
if (parents.isEmpty())
q->fileMessage(format("Project ERROR: %1").arg(msg));
else
q->fileMessage(format("Project ERROR: %1. File was included from: '%2'")
.arg(msg).arg(parents.join(QLatin1String("', '"))));
} else {
q->fileMessage(format("Project MESSAGE: %1").arg(msg));
}
return ProItem::ReturnFalse; return ProItem::ReturnFalse;
} }
#if 0 // Way too dangerous to enable. #if 0 // Way too dangerous to enable.
......
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