Qt6: change variable setting from FEATURE_cxx to QT_FEATURE_cxx #25652
+5
−5
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Changes to recipe: qt/6.x.x
Motivation
See #25651
With this change the CMAKE_CXX_STANDARD property is propagated correctly to the Qtbase submodule and most likely others aswell.
Details
Rename the defined cmake configuration variables for the c++ standard from
FEATURE_cxx
toQT_FEATURE_cxx
. As far as I see it cannot propagate the CXX_STANDARD correctly with the previous name: https://github.com/qt/qtbase/blob/bab1fd8fc3f8d6af5ad4b603c0dabdca434759a4/cmake/QtFlagHandlingHelpers.cmake#L355-L368.This flag for cppstd was originally added in #15098, @ericLemanissier I wonder if I missed something in my testing or if there was an upstream change in Qt that introduced or changed this. As far as i see, in version 6.4.0 it was also already named
QT_FEATURE_cxx20
and a while before that.