1*4882a593SmuzhiyunFrom 33e847c682efe11e10a0a42a262f096343418b97 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Samuli Piippo <samuli.piippo@qt.io>
3*4882a593SmuzhiyunDate: Mon, 24 Oct 2016 09:45:18 +0300
4*4882a593SmuzhiyunSubject: [PATCH] Disable all unknown features instead of erroring out
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunTask-number: QTBUG-56656
7*4882a593SmuzhiyunChange-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
8*4882a593SmuzhiyunUpstream-Status: Pending
9*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10*4882a593Smuzhiyun---
11*4882a593Smuzhiyun mkspecs/features/qt_configure.prf | 3 ++-
12*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 1 deletion(-)
13*4882a593Smuzhiyun
14*4882a593Smuzhiyundiff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
15*4882a593Smuzhiyunindex 6537d98c5d..06d23e3847 100644
16*4882a593Smuzhiyun--- a/mkspecs/features/qt_configure.prf
17*4882a593Smuzhiyun+++ b/mkspecs/features/qt_configure.prf
18*4882a593Smuzhiyun@@ -1544,7 +1544,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
19*4882a593Smuzhiyun                     error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
20*4882a593Smuzhiyun                 return($$result)
21*4882a593Smuzhiyun             }
22*4882a593Smuzhiyun-            error("Unknown feature object $${feature} in expression '$${1}'.")
23*4882a593Smuzhiyun+            warning("Unknown feature object $${feature} in expression '$${1}'.")
24*4882a593Smuzhiyun+            result = false
25*4882a593Smuzhiyun         }
26*4882a593Smuzhiyun         !qtConfCheckFeature($$feature): \
27*4882a593Smuzhiyun             error("Expression '$$1' is accessing non-emitted feature $${feature}.")
28