aboutsummarylogtreecommitdiffstats
path: root/0025-Ignore-errors-about-missing-feature-static.patch
diff options
context:
space:
mode:
authorMartchus2020-01-29 19:07:45 +0100
committerMartchus2020-01-29 19:07:45 +0100
commit987f9648ff49b109a9aabdfc52d0835c788f3c5c (patch)
treeefd536ff3770fa1dad569de18dd5e33f289de168 /0025-Ignore-errors-about-missing-feature-static.patch
parent36f967d0403c671dbe251d945a98e7f4e37e7176 (diff)
downloadaur-987f9648ff49b109a9aabdfc52d0835c788f3c5c.tar.gz
Update to 5.14.1
Diffstat (limited to '0025-Ignore-errors-about-missing-feature-static.patch')
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 9e24895c5320..085d7ec53ac0 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From 3b2e2f35716d183cba076dfea9de6ce73bd2ed1d Mon Sep 17 00:00:00 2001
+From 4da7840c0167fba67d57c7879291b996b094ca0b Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/31] Ignore errors about missing feature static
@@ -21,10 +21,10 @@ index 8273ba3fe1..4cdb55d4b3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 661b7dd961..86c873e3fd 100644
+index 7777e615bd..5f30366660 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -359,5 +359,5 @@ defineTest(qtConfig) {
+@@ -370,5 +370,5 @@ defineTest(qtConfig) {
contains(QT.$${module}.disabled_features, $$1): \
return(false)
}
@@ -32,5 +32,5 @@ index 661b7dd961..86c873e3fd 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.24.1
+2.25.0