diff options
author | Martchus | 2017-06-08 21:34:00 +0200 |
---|---|---|
committer | Martchus | 2017-06-08 21:34:00 +0200 |
commit | 7173374d6cf10c3f3bfba0aeb3ffc9a792851a22 (patch) | |
tree | 323f39decf999a9a9a5ee9cde325633832b7691f /0025-Ignore-errors-about-missing-feature-static.patch | |
parent | 359b0d47f7acead35fd6154db1663860ef829cbe (diff) | |
download | aur-7173374d6cf10c3f3bfba0aeb3ffc9a792851a22.tar.gz |
Update to 5.9.0
Diffstat (limited to '0025-Ignore-errors-about-missing-feature-static.patch')
-rw-r--r-- | 0025-Ignore-errors-about-missing-feature-static.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch deleted file mode 100644 index d36f4fe0f15a..000000000000 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 989341ca2c6ab8a256503dacc32ac49a37b9b0cd Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Wed, 25 Jan 2017 20:59:54 +0100 -Subject: [PATCH 25/30] 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 3762c14f98..a58200a297 100644 ---- a/mkspecs/features/qt_build_config.prf -+++ b/mkspecs/features/qt_build_config.prf -@@ -132,5 +132,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 999cd18154..6bf08ea583 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -349,5 +349,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.12.1 - |