1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: pro2cmake: default QT_FEATURE_system_* to "ON"

Browse Source 
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>
This commit is contained in:
Tobias Hunger 2019-01-28 15:06:44 +01:00
parent 9cee04ac94
commit 328de7aab9
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/cmake/pro2cmake.py
View File

@ -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)