summarylogtreecommitdiffstats
path: root/0027-Ignore-errors-about-missing-feature-static.patch
blob: f59dd3296a82221bf75e7846a16711ee882f94a7 (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 a674be4a5788536a25bc76e6a94e161a76ed9e51 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 27/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 0c6c10dded..54c4b568c1 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -141,5 +141,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.20.1