diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-03-19 11:48:13 +1100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-22 03:05:28 +0000 |
| commit | cade43c87cc10de6dea84806d844e92bc0b0b352 (patch) | |
| tree | 26102c20b1ac9ba988cab9f03874bac7f56e5810 /cmake | |
| parent | 25fe2c1f29b970a5703f6cbaf54be5d571babcd9 (diff) | |
Remove unnecessary $<BOOL:...> generator expression
The $<NOT:...> genex already guarantees to return a value of 0 or 1,
so there's no need to wrap it with $<BOOL:...>.
Change-Id: Iff4ad64ed8deaa846e1b5bc22d2e5d9dbcd77cc7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit df121fd7f74ecfb3de20867edea1c1f3ebf035c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPlugins.cmake.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in index 37ab1bb107..fd3370b9a2 100644 --- a/cmake/QtPlugins.cmake.in +++ b/cmake/QtPlugins.cmake.in @@ -29,9 +29,6 @@ function(__qt_internal_add_static_plugins_once) endif() 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(_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_versionless_is_in_type_whitelist}," "$<AND:" - "${_default_plugins_are_enabled_wrapped}," + "${_default_plugins_are_enabled}," "${_plugin_is_default}," "${_plugin_is_not_blacklisted}" ">" |