blob: 803dfe380f094db812e4a8ff7a390ad0fad9bbfe (
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 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 28/34] 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 76e1d15319..9a1c5cd8b6 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -138,5 +138,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.15.1
|