From ab23dce95f2a7dc4f1849c54d96d84abeadf05b7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 11 Nov 2016 14:45:48 +0100
Subject: [PATCH] qmake: make discard_from() patch up
 QMAKE_INTERNAL_INCLUDED_FILES as well

when the file's effects are discarded, the mention of the file should be
as well.

Change-Id: I894b7e2b887dd34d18533b197bfa9d0d84d647e7
(cherry picked from qtbase/c05f0a83fdb4823604d76f61bb884e206887e704)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/shared/proparser/qmakebuiltins.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index 17712874e7a..393b946bbb9 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -1375,6 +1375,10 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
                 ++fit;
         }
         pro->deref();
+        ProStringList &iif = m_valuemapStack.first()[ProKey("QMAKE_INTERNAL_INCLUDED_FILES")];
+        int idx = iif.indexOf(ProString(fn));
+        if (idx >= 0)
+            iif.removeAt(idx);
         return ReturnTrue;
     }
     case T_INFILE: