1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary $<BOOL:...> generator expression

Browse Source 
The $<NOT:...> genex already guarantees to return a value of 0 or 1,
so there's no need to wrap it with $<BOOL:...>.

Pick-to: 6.0 6.1
Change-Id: Iff4ad64ed8deaa846e1b5bc22d2e5d9dbcd77cc7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Craig Scott 2021-03-19 11:48:13 +11:00
parent 5da3f1e4b6
commit df121fd7f7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QtPlugins.cmake.in
View File

@ -29,9 +29,6 @@ function(__qt_internal_add_static_plugins_once)
endif() endif()
set(_default_plugins_are_enabled "$<NOT:$<STREQUAL:$<GENEX_EVAL:$<TARGET_PROPERTY:QT_DEFAULT_PLUGINS>>,0>>") set(_default_plugins_are_enabled "$<NOT:$<STREQUAL:$<GENEX_EVAL:$<TARGET_PROPERTY:QT_DEFAULT_PLUGINS>>,0>>")
# Make sure to boolify the result of the expression, in case if the returned property value
# is empty.
set(_default_plugins_are_enabled_wrapped "$<BOOL:${_default_plugins_are_enabled}>")
set(_manual_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS>>") set(_manual_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS>>")
set(_no_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_NO_PLUGINS>>") set(_no_plugins_genex "$<GENEX_EVAL:$<TARGET_PROPERTY:QT_NO_PLUGINS>>")
@ -125,7 +122,7 @@ function(__qt_internal_add_static_plugins_once)
"${_plugin_is_in_type_whitelist}," "${_plugin_is_in_type_whitelist},"
"${_plugin_versionless_is_in_type_whitelist}," "${_plugin_versionless_is_in_type_whitelist},"
"$<AND:" "$<AND:"
"${_default_plugins_are_enabled_wrapped}," "${_default_plugins_are_enabled},"
"${_plugin_is_default}," "${_plugin_is_default},"
"${_plugin_is_not_blacklisted}" "${_plugin_is_not_blacklisted}"
">" ">"