diff options
Diffstat (limited to '0025-Ignore-errors-about-missing-feature-static.patch')
-rw-r--r-- | 0025-Ignore-errors-about-missing-feature-static.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch new file mode 100644 index 000000000000..f28e1c84689c --- /dev/null +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -0,0 +1,36 @@ +From b4037f482107b0bde253b487487501b8bc82db55 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +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 511b158b917..39760d5ce44 100644 +--- a/mkspecs/features/qt_build_config.prf ++++ b/mkspecs/features/qt_build_config.prf +@@ -153,5 +153,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 7777e615bda..5f30366660b 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -370,5 +370,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.44.0 + |