diff options
author | Martchus | 2018-02-19 20:15:10 +0100 |
---|---|---|
committer | Martchus | 2018-02-19 20:15:10 +0100 |
commit | 2660e624877e04323aaac908770b038c92b7abc0 (patch) | |
tree | 6a83eda8e329fc43b34c64fb2ddcf5146d475811 /0027-Ignore-errors-about-missing-feature-static.patch | |
parent | 4536f0e121fda87c68095bf7ae5d108aaf7706d3 (diff) | |
download | aur-2660e624877e04323aaac908770b038c92b7abc0.tar.gz |
Update to 5.10.1
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..2c7ef03220dd --- /dev/null +++ b/0027-Ignore-errors-about-missing-feature-static.patch @@ -0,0 +1,36 @@ +From 98d20d4f7bdf5a8b364dbfbccfd17caa12092feb Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Wed, 25 Jan 2017 20:59:54 +0100 +Subject: [PATCH 27/32] 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 76e1d15319..9a1c5cd8b6 100644 +--- a/mkspecs/features/qt_build_config.prf ++++ b/mkspecs/features/qt_build_config.prf +@@ -138,5 +138,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.16.1 + |