From 97551b90b974f943ff3fac40314c79ef922596d3 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 21 Aug 2020 15:10:46 +0200
Subject: [PATCH] CMake: Actually evaluate AUTODETECT expressions in features

Very simple AUTODETECT expressions worked fine, but expressions with
parentheses, for example, were not correctly evaluated.

Change-Id: Ibec4fa55474e149a701f861838fdea41d31beca0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtFeature.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
index 66242548ed8..8d22235d4dc 100644
--- a/cmake/QtFeature.cmake
+++ b/cmake/QtFeature.cmake
@@ -253,9 +253,10 @@ function(qt_evaluate_feature feature)
 
     qt_evaluate_config_expression(disable_result ${arg_DISABLE})
     qt_evaluate_config_expression(enable_result ${arg_ENABLE})
+    qt_evaluate_config_expression(auto_detect ${arg_AUTODETECT})
     if(${disable_result})
         set(result OFF)
-    elseif((${enable_result}) OR (${arg_AUTODETECT}))
+    elseif((${enable_result}) OR (${auto_detect}))
         set(result ${condition})
     else()
         # feature not auto-detected and not explicitly enabled