2020-11-20 11:45:38 +01:00
|
|
|
From d29a2b44643831e439755d11348b69dc9ed6d60b Mon Sep 17 00:00:00 2001
|
2017-01-23 21:37:13 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
Date: Wed, 25 Jan 2017 20:59:54 +0100
|
2019-12-13 01:00:48 +01:00
|
|
|
Subject: [PATCH 25/31] Ignore errors about missing feature static
|
2017-01-23 21:37:13 +01:00
|
|
|
|
|
|
|
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
|
2020-04-02 12:52:46 +02:00
|
|
|
index 511b158b91..39760d5ce4 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/mkspecs/features/qt_build_config.prf
|
|
|
|
+++ b/mkspecs/features/qt_build_config.prf
|
2020-04-02 12:52:46 +02:00
|
|
|
@@ -153,5 +153,5 @@ defineTest(qtConfig) {
|
2017-01-23 21:37:13 +01:00
|
|
|
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
|
2020-01-28 21:12:38 +01:00
|
|
|
index 7777e615bd..5f30366660 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/mkspecs/features/qt_functions.prf
|
|
|
|
+++ b/mkspecs/features/qt_functions.prf
|
2020-01-28 21:12:38 +01:00
|
|
|
@@ -370,5 +370,5 @@ defineTest(qtConfig) {
|
2017-01-23 21:37:13 +01:00
|
|
|
contains(QT.$${module}.disabled_features, $$1): \
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
- error("Could not find feature $${1}.")
|
|
|
|
+ !equals($$1, "static"): error("Could not find feature $${1}.")
|
|
|
|
}
|
|
|
|
--
|
2020-11-20 11:45:38 +01:00
|
|
|
2.29.2
|
2017-01-23 21:37:13 +01:00
|
|
|
|