aboutsummarylogtreecommitdiffstats
path: root/0025-Ignore-errors-about-missing-feature-static.patch
diff options
context:
space:
mode:
authorMartchus2019-06-26 14:41:36 +0200
committerMartchus2019-06-26 14:41:36 +0200
commitf817cbcc8c47496a5967fa06c162cddfa98f386a (patch)
tree62a3008a3b3ebe67f5007c5f46ed48b85ea5c383 /0025-Ignore-errors-about-missing-feature-static.patch
parent7cd2ce36c60bf5e1ad40f9af6ef97c9c539d345c (diff)
downloadaur-f817cbcc8c47496a5967fa06c162cddfa98f386a.tar.gz
Update to 5.13.0
Diffstat (limited to '0025-Ignore-errors-about-missing-feature-static.patch')
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch36
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..4e56453a03aa
--- /dev/null
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -0,0 +1,36 @@
+From d7094ac797963aabfd2f09402fbdab1730ace836 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 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.22.0
+