diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-28 15:06:44 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-31 08:48:55 +0000 |
| commit | 328de7aab92abbaa6e25b8ad3d55f6841504bfee (patch) | |
| tree | d81b76f0744cc279e44c4e1bf43ec72e1617615b /util | |
| parent | 9cee04ac9464af82da9f7b54844509b7bb8a62e8 (diff) | |
CMake: pro2cmake: default QT_FEATURE_system_* to "ON"
Qt 6 will use external libraries for everything, so
default all QT_FEATURE_system_foo to "ON".
Change-Id: I884a4293c64487271be08de5fab82e6858d0a2ed
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index d4d352d4f6..3e2e5e13b0 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -552,7 +552,12 @@ def map_condition(condition: str) -> str: part = 'TARGET {}'.format(map_qt_base_library( feature.group(2))) else: - part = 'QT_FEATURE_' + featureName(feature.group(2)) + feature = featureName(feature.group(2)) + if feature.startswith('system_') and substitute_libs(feature[7:]) != feature[7:]: + # Qt6 always uses system libraries! + part = 'ON' + else: + part = 'QT_FEATURE_' + feature else: part = substitute_platform(part) |