diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-02-11 17:52:39 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-02-11 17:16:08 +0000 |
| commit | 93564b3f8be7506dbd9941ebc4fbdbf575f4beb4 (patch) | |
| tree | c2d9609b95d04aed68c191e4783f8f82e3958659 /util | |
| parent | fb33efd2743933211455048aa111e4fc12e1e6a7 (diff) | |
CMake: pro2cmake.py: Treat ANDROID_EMBEDDED as ANDROID
Treat ANDROID_EMBEDDED as ANDROID when simplifying conditions.
Change-Id: I2cf0ea1e1a3e882e3a7b7276867dcee452866ade
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 13ee97cf00..f18abcc81f 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -943,6 +943,7 @@ def _recursive_simplify(expr): expr = _simplify_flavors_in_condition('APPLE', apples, expr) expr = _simplify_flavors_in_condition('BSD', bsds, expr) expr = _simplify_flavors_in_condition('UNIX', unixes, expr) + expr = _simplify_flavors_in_condition('ANDROID', ('ANDROID_EMBEDDED',), expr) # Now simplify further: expr = simplify_logic(expr) |