From a03f8643a7a1df8b7c857446a19cb25f9314cdb2 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 20 May 2009 14:34:22 +0200
Subject: [PATCH] make message() & co. handling more qmake-like
which basically means cutting features. heh
---
src/shared/proparser/profileevaluator.cpp | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 58d737221e5..9b7b2c4e734 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -2207,20 +2207,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.
--
GitLab