summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-05-20 12:34:22 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-07-20 12:30:35 (GMT)
commit219f4635dab0c5a8a56753bee429ebd6c935c623 (patch)
treec8b95f99449a5f4cac896421e96849cb857d2f14 /tools
parent56fe2c35c8dc07ec8cbbcdb4d0371837c5e77321 (diff)
downloadQt-219f4635dab0c5a8a56753bee429ebd6c935c623.zip
Qt-219f4635dab0c5a8a56753bee429ebd6c935c623.tar.gz
Qt-219f4635dab0c5a8a56753bee429ebd6c935c623.tar.bz2
make message() & co. handling more qmake-like
which basically means cutting features. heh cherry-picked a03f8643a7a1df8b7c857446a19cb25f9314cdb2 from creator
Diffstat (limited to 'tools')
-rw-r--r--tools/linguist/shared/profileevaluator.cpp15
1 files changed, 1 insertions, 14 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp
index 50027de..83fcb3e 100644
--- a/tools/linguist/shared/profileevaluator.cpp
+++ b/tools/linguist/shared/profileevaluator.cpp
@@ -2188,20 +2188,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
return ProItem::ReturnFalse;
}
QString msg = fixEnvVariables(args.first());
- if (function == QLatin1String("error")) {
- 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));
- }
+ q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg));
return ProItem::ReturnFalse;
}
#if 0 // Way too dangerous to enable.