qt5: Update to Qt 5.14.0

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>

1 files changed, 16 insertions, 16 deletions

diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 169ed078..7bda76a2 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -13,13 +13,26 @@ for the qmakes's host architecture.
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
 ---
+ src/buildtools/config/linux.pri   |  2 +-
  src/buildtools/configure_host.pro | 14 +++++++-------
  src/buildtools/gn.pro             |  4 ++--
- src/core/config/linux.pri         |  2 +-
  3 files changed, 10 insertions(+), 10 deletions(-)
 
+diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
+index 998aedc..b04db36 100644
+--- a/src/buildtools/config/linux.pri
++++ b/src/buildtools/config/linux.pri
+@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
+ 
+ host_build {
+     gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
+-    GN_HOST_CPU = $$gnArch($$QT_ARCH)
++    GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
+     gn_args += host_cpu=\"$$GN_HOST_CPU\"
+     # Don't bother trying to use system libraries in this case
+     gn_args += use_glib=false
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index dd0d3e32..6312c867 100644
+index dd0d3e3..6312c86 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
 @@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
 diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
-index b6bf9cfc..ae419b1a 100644
+index 033202e..a8ca656 100644
 --- a/src/buildtools/gn.pro
 +++ b/src/buildtools/gn.pro
 @@ -19,8 +19,8 @@ build_pass|!debug_and_release {
@@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644
  
              msvc:!clang_cl: gn_gen_args += --use-lto
  
-diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index f45c418f..df8ac00b 100644
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -123,7 +123,7 @@ contains(QT_ARCH, "mips") {
- 
- host_build {
-     gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
--    GN_HOST_CPU = $$gnArch($$QT_ARCH)
-+    GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
-     gn_args += host_cpu=\"$$GN_HOST_CPU\"
-     # Don't bother trying to use system libraries in this case
-     gn_args += use_glib=false