From b5fccc2c7f1da12f76fa55d15f32f2c0d80f820c Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/32] Ignore errors about missing feature static Not sure why this error occurs, let's hope for the best --- mkspecs/features/qt_build_config.prf | 2 +- mkspecs/features/qt_functions.prf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index 8a7c9c28d3..003a694f44 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -143,5 +143,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } - error("Could not find feature $${1}.") + !equals($$1, "static"): error("Could not find feature $${1}.") } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1903e509c8..1fcb597fa3 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -348,5 +348,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } - error("Could not find feature $${1}.") + !equals($$1, "static"): error("Could not find feature $${1}.") } -- 2.24.0