2018-12-22 00:04:30 +01:00
|
|
|
From a674be4a5788536a25bc76e6a94e161a76ed9e51 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
|
2018-09-19 20:39:07 +02:00
|
|
|
Subject: [PATCH 27/33] 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
|
2018-12-08 22:06:32 +01:00
|
|
|
index 0c6c10dded..54c4b568c1 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/mkspecs/features/qt_build_config.prf
|
|
|
|
+++ b/mkspecs/features/qt_build_config.prf
|
2018-12-08 22:06:32 +01:00
|
|
|
@@ -141,5 +141,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
|
2017-12-08 19:49:53 +01:00
|
|
|
index 1903e509c8..1fcb597fa3 100644
|
2017-01-23 21:37:13 +01:00
|
|
|
--- a/mkspecs/features/qt_functions.prf
|
|
|
|
+++ b/mkspecs/features/qt_functions.prf
|
2017-12-08 19:49:53 +01:00
|
|
|
@@ -348,5 +348,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}.")
|
|
|
|
}
|
|
|
|
--
|
2018-12-22 00:04:30 +01:00
|
|
|
2.20.1
|
2017-01-23 21:37:13 +01:00
|
|
|
|