diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-09 14:55:17 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 07:33:27 +0100 |
| commit | f46c11989a36e221f89b4e7df2a3b2ec81e917a2 (patch) | |
| tree | c698dcf8f2cbe96e7b26a5147dbb23b51ccac74b | |
| parent | 37714de9a65561db33c7457e2d5e852b2af1774a (diff) | |
CMake: pro2cmake: Fix opengles condition substitution
Missing parenthesis caused wrong condiiton simplification in scopes.
Change-Id: Ia2a1a97f4da36b185631a2a3c7855ae01595b0f7
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index bba01bb595..de2f175953 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1432,7 +1432,7 @@ def map_condition(condition: str) -> str: ) condition = re.sub( r"qtConfig\(opengl\(es1\|es2\)\?\)", - r"QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3", + r"(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3)", condition, ) condition = re.sub(r"qtConfig\(opengl\.\*\)", r"QT_FEATURE_opengl", condition) |