diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2021-09-20 17:30:08 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-21 14:08:07 +0000 |
commit | 3e98ad97b56b90047fa96da4ab6429fbb556ec5d (patch) | |
tree | 0669bfd3c64e8dec0084c9a48544c6e0c8eb562f /cmake/QtFeature.cmake | |
parent | cb11e2e760c960da50e2edc5b7e5984fec58b0af (diff) |
Use only supported values when setting internal QT_FEATURE_ values
When setting QT_FEATURE_ values we need to convert the user-provided
FEATURE_ values to the one that is supported by QT_FEATURE_.
Fixes: QTBUG-96300
Change-Id: Idd19fbf7f23f351a6c1cfdcedccfaaf6b0aa6e44
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 68ad67b6faf6922c66ddafee0dc055666a73cddd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake/QtFeature.cmake')
-rw-r--r-- | cmake/QtFeature.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index b63ad24e9a..be75f40ec0 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -269,7 +269,11 @@ endfunction() # Saves the final user value to QT_FEATURE_${feature}, after checking that the condition is met. macro(qt_feature_check_and_save_internal_value feature saved_user_value condition label conditionExpression) - set(result "${saved_user_value}") + if(${saved_user_value}) + set(result ON) + else() + set(result OFF) + endif() if ((NOT condition) AND result) _qt_internal_dump_expression_values(conditionDump "${conditionExpression}") |