diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-03-26 14:12:09 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@qt.io> | 2019-03-28 06:30:32 +0000 |
| commit | 89f34ee42a6f54e528533e673faa7e5fd371af4f (patch) | |
| tree | bbf3e632d22bda00bfb2655cd58c85596d50b3da /util/cmake/pro2cmake.py | |
| parent | 8fa9a987ea7bb25ef96d325a8fbbb8031e9ada63 (diff) | |
Fix turned logic in RemoveOperation
It is regression caused by a0a94576fae26bcbbf3823a6ee4b554886e84925
("Fix RemoveOperation").
Add unit test for all operation types to make sure this code actually
works:-)
Change-Id: I97c94cb3411f05de89422e3fa2222f2217a09e49
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'util/cmake/pro2cmake.py')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index e77d6fdcaf9..676ed4b406e 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -239,15 +239,19 @@ class RemoveOperation(Operation): def process(self, input): input_set = set(input) - result_set = set(self._value) + value_set = set(self._value) result = [] - for v in self._value: - if v in input_set: - continue - if v in result_set: + + # Add everything that is not going to get removed: + for v in input: + if v not in value_set: result += [v,] - else: + + # Add everything else with removal marker: + for v in self._value: + if v not in input_set: result += ['-{}'.format(v), ] + return result def __repr__(self): |