summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@qt.io>2019-03-26 10:17:58 +0100
committerJędrzej Nowacki <jedrzej.nowacki@qt.io>2019-03-26 11:14:32 +0000
commita0a94576fae26bcbbf3823a6ee4b554886e84925 (patch)
treeb2e1c762bc8532997cf8cb2f345b0b1a7c5b54f1
parenteb3d73ffb778e191aa5705fd1867c62809eedf9b (diff)
Fix RemoveOperation
The operation was using an empty set as a base, so it was not really functional. Change-Id: I98fd80c1ede31994857aa1f0c8947ca7b9f76649 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
-rwxr-xr-xutil/cmake/pro2cmake.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 4c8d281549..e77d6fdcaf 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -239,10 +239,13 @@ class RemoveOperation(Operation):
def process(self, input):
input_set = set(input)
+ result_set = set(self._value)
result = []
for v in self._value:
if v in input_set:
continue
+ if v in result_set:
+ result += [v,]
else:
result += ['-{}'.format(v), ]
return result