aboutsummarylogtreecommitdiffstats
path: root/0025-Ignore-errors-about-missing-feature-static.patch
diff options
context:
space:
mode:
authorMartchus2019-12-24 22:47:51 +0100
committerMartchus2019-12-24 22:47:51 +0100
commit36f967d0403c671dbe251d945a98e7f4e37e7176 (patch)
tree8f1ceee24a5790bfac77ab1125bb0e3ce49a0e4a /0025-Ignore-errors-about-missing-feature-static.patch
parente9bef2eeef352849a078dad6d1b6aed0ffed4bc4 (diff)
downloadaur-36f967d0403c671dbe251d945a98e7f4e37e7176.tar.gz
Update to 5.14.0
Diffstat (limited to '0025-Ignore-errors-about-missing-feature-static.patch')
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 8cfe19d0b2f6..9e24895c5320 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From b5fccc2c7f1da12f76fa55d15f32f2c0d80f820c Mon Sep 17 00:00:00 2001
+From 3b2e2f35716d183cba076dfea9de6ce73bd2ed1d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 25/32] Ignore errors about missing feature static
+Subject: [PATCH 25/31] Ignore errors about missing feature static
Not sure why this error occurs, let's hope for the best
---
@@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
-index 8a7c9c28d3..003a694f44 100644
+index 8273ba3fe1..4cdb55d4b3 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
-@@ -143,5 +143,5 @@ defineTest(qtConfig) {
+@@ -150,5 +150,5 @@ defineTest(qtConfig) {
contains(QT.$${module}.disabled_features, $$1): \
return(false)
}
@@ -21,10 +21,10 @@ index 8a7c9c28d3..003a694f44 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 1903e509c8..1fcb597fa3 100644
+index 661b7dd961..86c873e3fd 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -348,5 +348,5 @@ defineTest(qtConfig) {
+@@ -359,5 +359,5 @@ defineTest(qtConfig) {
contains(QT.$${module}.disabled_features, $$1): \
return(false)
}
@@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.24.0
+2.24.1