28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
|
From 33e847c682efe11e10a0a42a262f096343418b97 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Samuli Piippo <samuli.piippo@qt.io>
|
||
|
|
Date: Mon, 24 Oct 2016 09:45:18 +0300
|
||
|
|
Subject: [PATCH] Disable all unknown features instead of erroring out
|
||
|
|
|
||
|
|
Task-number: QTBUG-56656
|
||
|
|
Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
|
||
|
|
Upstream-Status: Pending
|
||
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
||
|
|
---
|
||
|
|
mkspecs/features/qt_configure.prf | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
|
||
|
|
index 6537d98c5d..06d23e3847 100644
|
||
|
|
--- a/mkspecs/features/qt_configure.prf
|
||
|
|
+++ b/mkspecs/features/qt_configure.prf
|
||
|
|
@@ -1544,7 +1544,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
|
||
|
|
error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
|
||
|
|
return($$result)
|
||
|
|
}
|
||
|
|
- error("Unknown feature object $${feature} in expression '$${1}'.")
|
||
|
|
+ warning("Unknown feature object $${feature} in expression '$${1}'.")
|
||
|
|
+ result = false
|
||
|
|
}
|
||
|
|
!qtConfCheckFeature($$feature): \
|
||
|
|
error("Expression '$$1' is accessing non-emitted feature $${feature}.")
|