summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp/cppwriteinitialization.h
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2023-08-24 18:52:55 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2023-09-06 17:22:07 +0200
commit17efffe1ad6b85f45f418d5d08b5e85a456b12e3 (patch)
tree5217a594733ac24f93e371de736741295c90b16f /src/tools/uic/cpp/cppwriteinitialization.h
parent65e04162d17dfe2d18fa302c930f0a3d68131a2e (diff)
CMake: Fix toggling of FEATURE_developer_build and some other options
Previously if Qt was configured with -developer-build, configure would pass to CMake -DINPUT_developer_build=ON, which will ensure that both FEATURE_developer_build and QT_FEATURE_developer_build are set to ON. Then if somebody tries to toggle FEATURE_developer_build to OFF in the CMakeCache.txt and rerun cmake, the feature will bounce back to ON, due to the code in QtSetup.cmake that doesn't take into account if FEATURE_developer_build is already defined, and thus reset it based on the value that is cached in INPUT_developer_build. Change the checks for INPUT_developer_build and INPUT_no_prefix, to take into account the defined-ness of their FEATURE_ counterparts. If they are defined, ignore the INPUT_ values. This allows toggling the FEATURE_ variables and also aligns with the INPUT_ handling behavior that we have in qt_evaluate_feature which ignores INPUT_ values once the FEATURE_ is defined. While this aligns the behavior with other features, there is still a problem. If you first configure without -developer-build, and FEATURE_developer_build is set OFF, and then reconfigure with -developer-build, because FEATURE_developer_build is already defined, the INPUT_developer_build=ON is ignored. This is a problem for other features as well and will be handled in a follow up change. Pick-to: 6.6 Task-number: QTBUG-112957 Change-Id: I4f31157b0e7963e4d43e28062a585e939ceea0c1 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.h')
0 files changed, 0 insertions, 0 deletions