Merge remote-tracking branch 'qtyocto/5.11' into 5.12

* qtyocto/5.11:

  3439f34 qtbase: update changelog
  0bc53eb qt5: update submodules
  1b356a7 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
  9ffdd55 qtscript: Update the custom patch from mainline
  95d64ea qtbase: remove renameat2 PACKAGECONFIG
  2d1d807 qtbase: fix build with glibc-2.28 - for non-readers like me
  e4abbde qtwebengine: Fix optonal glib-2.0 dependency
  1fb8aff qtwebkit_git.bb: Fix configure failure on bison
  cb7dfcc qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
  70b090a qtwebengine: add a package config to enable proprietary codecs
  bb38f64 qt3d-runtime: add recipe for Qt 3D Studio runtime library
  75e2d3a qtbase: update the dependency for gbm PACKAGECONFIG
  539e4f0 qtbase: fix build with glibc-2.28
  c2e4ec6 nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
  4587cc3 qtchooser: drop useless patch, set PV
  3a4ad54 packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
  2736dcf qtbase: Add a kde PACKAGECONFIG

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb

Change-Id: Ic58c0577f9df0aaac613befeacb1db98c6af5d17

1 files changed, 50 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch
new file mode 100644
index 00000000..878a8ab9
--- /dev/null
+++ b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch
@@ -0,0 +1,50 @@
+From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001
+From: Alistair Francis <alistair.francis@wdc.com>
+Date: Wed, 18 Jul 2018 14:26:21 -0700
+Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support
+
+Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
+Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57
+Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
+
+Upstream-Status: Backport
+---
+ .../javascriptcore/JavaScriptCore/wtf/Platform.h   | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index 00caa6d..96942c7 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -397,6 +397,16 @@
+ #endif
+ #endif /* __mips__ */
+ 
++/* CPU(RISCV64) - RISC-V 64-bit */
++#if defined(__riscv) && __riscv_xlen == 64
++#define WTF_CPU_RISCV64 1
++#endif
++
++/* CPU(RISCV32) - RISC-V 32-bit */
++#if defined(__riscv) && __riscv_xlen == 32
++#define WTF_CPU_RISCV32 1
++#endif
++
+ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like 
+    virtual memory, not to choose a GUI toolkit ==== */
+ 
+@@ -948,9 +958,9 @@
+ #endif
+ 
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64)
+ #define WTF_USE_JSVALUE64 1
+-#elif CPU(ARM) || CPU(PPC64)
++#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32)
+ #define WTF_USE_JSVALUE32 1
+ #elif OS(WINDOWS) && COMPILER(MINGW)
+ /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg
+-- 
+2.17.1
+