summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-04-08 13:32:26 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-13 08:15:52 +0000
commitabe4e3d2fbd7c59665c81f2a96d277d361512cc5 (patch)
tree502c0617deea298cdd2d19693ea3bc334af65a7a
parentefbcfcc067b1755dd89a819954ec9fd20c58b00e (diff)
CMake: Fix condition evaluation in plugin's DEFAULT_IF option
Expand the condition without an extra negation. This fixes incorrect condition evaluation for conditions not enclosed in parenthesis. Change-Id: I4923059b6b199676058091c23d51c9368daaebd0 Reviewed-by: Craig Scott <craig.scott@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit c1ac201f5c9905751eb35531f26311c8d291f9cc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--cmake/QtPluginHelpers.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
index 2e1ede73cb..0a985760c7 100644
--- a/cmake/QtPluginHelpers.cmake
+++ b/cmake/QtPluginHelpers.cmake
@@ -151,12 +151,12 @@ function(qt_internal_add_plugin target)
set(_default_plugin 1)
endif()
- if (DEFINED arg_DEFAULT_IF)
- if (NOT ${arg_DEFAULT_IF})
- set(_default_plugin 0)
- else()
- set(_default_plugin 1)
- endif()
+ if(DEFINED arg_DEFAULT_IF)
+ if(${arg_DEFAULT_IF})
+ set(_default_plugin 1)
+ else()
+ set(_default_plugin 0)
+ endif()
endif()
# Save the Qt module in the plug-in's properties and vice versa