summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2019-10-31 16:52:23 +0100
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2019-11-01 09:43:12 +0000
commit5c6cf6692e23a1603deee5ba4aa4566d245d7fbb (patch)
tree010ae8573dabc18b982995333f92310aebfced88
parent48c56a992e87bcdcb289da35d89223d418c1d2fe (diff)
Prevent infinite recursion
In qtvirtualkeyboard/src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/src/lipicommon.pri we have TARGET = $$TARGET$$qtPlatformTargetSuffix which keeps on recursing. Change-Id: Ia0e020c7258cd87bba9b9681ed7b4568e8f0c9c2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@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 ec13f26fbd..c16864d474 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -1111,6 +1111,9 @@ class Scope(object):
else:
replacement = self.get(match.group(1), inherit=True)
replacement_str = replacement[0] if replacement else ""
+ if replacement_str == value:
+ # we have recursed
+ replacement_str = ""
result = result[: match.start()] + replacement_str + result[match.end() :]
result = self._replace_env_var_value(result)