summarylogtreecommitdiffstats
path: root/0025-Ignore-errors-about-missing-feature-static.patch
blob: d8d6d587813d4c184009047fa93aac79860a46e7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
From 2c8b96ba9881f3e26bfd6f191b69186c463e9991 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/33] 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.23.0