From 96276c85d883a5331fe5685790e773db1fd52c14 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 14 Jul 2009 20:10:54 +0200
Subject: [PATCH] remove bizarre TARGET hack
it was superseeded by using non-cumulative, corrected evalution for
determining the targets.
---
src/shared/proparser/profileevaluator.cpp | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index 3dcda2a7662..58f75baf064 100644
--- a/src/shared/proparser/profileevaluator.cpp
+++ b/src/shared/proparser/profileevaluator.cpp
@@ -242,8 +242,6 @@ public:
QStack<QHash<QString, QStringList> > m_valuemapStack;
QStack<QHash<const ProFile*, QHash<QString, QStringList> > > m_filevaluemapStack;
- int m_prevLineNo; // Checking whether we're assigning the same TARGET
- ProFile *m_prevProFile; // See m_prevLineNo
QStringList m_addUserConfigCmdArgs;
QStringList m_removeUserConfigCmdArgs;
bool m_parsePreAndPostFiles;
@@ -257,10 +255,6 @@ Q_DECLARE_TYPEINFO(ProFileEvaluator::Private::ProLoop, Q_MOVABLE_TYPE);
ProFileEvaluator::Private::Private(ProFileEvaluator *q_)
: q(q_)
{
- // Global parser state
- m_prevLineNo = 0;
- m_prevProFile = 0;
-
// Configuration, more or less
m_verbose = true;
m_cumulative = true;
@@ -824,23 +818,6 @@ void ProFileEvaluator::Private::visitProValue(ProValue *value)
QStringList v = expandVariableReferences(val);
- // Since qmake combines different values for the TARGET variable, we join
- // TARGET values that are on the same line. We can't do this later with all
- // values because this parser isn't scope-aware, so we'd risk joining
- // scope-specific targets together.
- if (varName == QLatin1String("TARGET")
- && m_lineNo == m_prevLineNo
- && currentProFile() == m_prevProFile) {
- QStringList targets = m_tempValuemap.value(QLatin1String("TARGET"));
- m_tempValuemap.remove(QLatin1String("TARGET"));
- QStringList lastTarget(targets.takeLast());
- lastTarget << v.join(QLatin1String(" "));
- targets.push_back(lastTarget.join(QLatin1String(" ")));
- v = targets;
- }
- m_prevLineNo = m_lineNo;
- m_prevProFile = currentProFile();
-
switch (m_variableOperator) {
case ProVariable::SetOperator: // =
if (!m_cumulative) {
--
GitLab