3d0243711e
std::optional::value_or() should not be used when its argument is a non-trivial type, because the argument is created and destroyed independent of whether it is used in the end. In this case, we don't even need an optional, because parseScreenScaleFactorsSpec() takes the output of qEnvironmentVariable() (not -OptionalString) as-is, so we can just drop the unneeded optional-(un)wrapping. Since this patch apparently removes the last user of qEnviromentVariableOptionalString(), mark that function as [[maybe_unused]]. Outright removal may cause cherry-picks to fail, so will come as a follow-up. Amends 4d1f13f3549a73f5ca4e64dac9137e83138080fa. Pick-to: 6.8 6.5 Change-Id: Ic2bb8a3aa8e946b957047ff4faf48c4082fc9c01 Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> (cherry picked from commit bee49bde04777eae348aead0abc3212fa945c0ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>