diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-02 14:13:27 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-04-02 13:32:21 +0000 |
| commit | e2e4525f7841d95c531218297ef0d57b6280aa3d (patch) | |
| tree | f9322778429bd79fa983082a591f8960f02c0174 /util | |
| parent | 72e0f74e31a7d293a8c4f440a564efe6d1352cb7 (diff) | |
Fix simplification of conditions involving apple
Previously a condition like APPLE AND (NOT APPLE_OSX) got simplified
to APPLE, which is wrong.
This happened by accident due to some sub-family simplifications
involving BSD, which APPLE was part of.
Technically APPLE is BSD derived, but for the purposes of the
conversion script consider APPLE not to be a BSD (hopefully there
should be no cases of using the bsd scope for apple machines in
qmake files.
Also regenerate the fontdatabase project, where the issue was found.
Change-Id: I18dcf4f29ffbff48c183ba95ca2a2e5cd5325d86
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'util')
| -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 7a6e6abbae..9173f84901 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -1069,7 +1069,7 @@ def _recursive_simplify(expr): windowses = ('WIN32', 'WINRT') apples = ('APPLE_OSX', 'APPLE_UIKIT', 'APPLE_IOS', 'APPLE_TVOS', 'APPLE_WATCHOS',) - bsds = ('APPLE', 'FREEBSD', 'OPENBSD', 'NETBSD',) + bsds = ('FREEBSD', 'OPENBSD', 'NETBSD',) androids = ('ANDROID', 'ANDROID_EMBEDDED') unixes = ('APPLE', *apples, 'BSD', *bsds, 'LINUX', *androids, 'HAIKU', |