diff options
author | Martchus | 2017-06-08 21:33:56 +0200 |
---|---|---|
committer | Martchus | 2017-06-08 21:33:56 +0200 |
commit | 3df6482af8c916f5105111d1dcf6711e01a56c47 (patch) | |
tree | 55879cff03b12573e665e21cdd7c7d7e65df1c2d /0027-Ignore-errors-about-missing-feature-static.patch | |
parent | 288f048fafcb5879c7c038c7e507b6ea98732b93 (diff) | |
download | aur-3df6482af8c916f5105111d1dcf6711e01a56c47.tar.gz |
Update to 5.9.0
Diffstat (limited to '0027-Ignore-errors-about-missing-feature-static.patch')
-rw-r--r-- | 0027-Ignore-errors-about-missing-feature-static.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/0027-Ignore-errors-about-missing-feature-static.patch b/0027-Ignore-errors-about-missing-feature-static.patch new file mode 100644 index 000000000000..b4614e6123b6 --- /dev/null +++ b/0027-Ignore-errors-about-missing-feature-static.patch @@ -0,0 +1,36 @@ +From 3d7baa02c957207beffa3e2d4b936a6a6c5cc19b Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Wed, 25 Jan 2017 20:59:54 +0100 +Subject: [PATCH 27/31] 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 150d2b2cc3..d93d24cce5 100644 +--- a/mkspecs/features/qt_build_config.prf ++++ b/mkspecs/features/qt_build_config.prf +@@ -135,5 +135,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 c00fdb73f8..d4d5599433 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -351,5 +351,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.13.0 + |