From df121fd7f74ecfb3de20867edea1c1f3ebf035c2 Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@qt.io>
Date: Fri, 19 Mar 2021 11:48:13 +1100
Subject: [PATCH] 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:...>.

Pick-to: 6.0 6.1
Change-Id: Iff4ad64ed8deaa846e1b5bc22d2e5d9dbcd77cc7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 cmake/QtPlugins.cmake.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in
index 37ab1bb107c..fd3370b9a28 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}"
                     ">"