Update to 5.10.0

1 files changed, 36 insertions, 0 deletions

diff --git a/0028-Ignore-errors-about-missing-feature-static.patch b/0028-Ignore-errors-about-missing-feature-static.patch
new file mode 100644
index 000000000000..803dfe380f09
--- /dev/null
+++ b/0028-Ignore-errors-about-missing-feature-static.patch
@@ -0,0 +1,36 @@
+From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Wed, 25 Jan 2017 20:59:54 +0100
+Subject: [PATCH 28/34] 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.15.1
+