diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-16 15:54:50 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-18 15:44:49 +0000 |
| commit | 933162c4450e0b9c4a7bc2b2a2aac74d8476b23d (patch) | |
| tree | 721e1d81f9fb7f224e9da19a56ef42d1a7e92b94 | |
| parent | 5c2cfd79732994d1f9d0353e24e8b1c3b2883f27 (diff) | |
Do not rewrite boolean INPUTs if they have a corresponding feature
Initial replacement of boolean INPUT_ variables to the FEATURE_
variables was wrongly changed to updating of the INPUT_ variable
value to ON/OFF value. This causes potential issues when INPUT_
variable has explicit check for 'yes' or 'no'.
The feature evaluation step enables FEATURE_ variables in case if
the corresponding INPUT_ variable contains a positive CMake value.
So there is no need to process boolean INPUTs at the argument
processing step.
Also no need to keep the special opengl case, since it will be
processed correctly.
Fixes: QTBUG-91158
Change-Id: I96bb7903a904ae3cf788d7ef7d4e0c019046eb95
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 530b62934923070b5b8b5c5b3c764a2b7d4db039)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 1f758c53b9..07ac50e000 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -764,11 +764,6 @@ if("${INPUT_ltcg}" STREQUAL "yes") endforeach() endif() -if(NOT "${INPUT_opengl}" STREQUAL "") - drop_input(opengl) - push("-DINPUT_opengl=${INPUT_opengl}") -endif() - translate_list_input(device-option QT_QMAKE_DEVICE_OPTIONS) translate_list_input(defines QT_EXTRA_DEFINES) translate_list_input(fpaths QT_EXTRA_FRAMEWORKPATHS) @@ -776,13 +771,6 @@ translate_list_input(includes QT_EXTRA_INCLUDEPATHS) translate_list_input(lpaths QT_EXTRA_LIBDIRS) translate_list_input(rpaths QT_EXTRA_RPATHS) -foreach(feature ${commandline_known_features}) - qt_feature_normalize_name("${feature}" cmake_feature) - if(${feature} IN_LIST config_inputs) - translate_boolean_input(${feature} INPUT_${cmake_feature}) - endif() -endforeach() - foreach(input ${config_inputs}) qt_feature_normalize_name("${input}" cmake_input) push("-DINPUT_${cmake_input}=${INPUT_${input}}") |