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, 0 insertions, 58 deletions

diff --git a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch b/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch
deleted file mode 100644
index a083decf..00000000
--- a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 8fd53951d53ef8c5b62fe985665dad0545bb3161 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Mon, 4 Jun 2018 14:24:59 -0700
-Subject: [PATCH] javascriptcore: Use 64-bit ints
-
-Where required use 64-bit integers for casts.
-
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-Upstream-Status: Pending
----
- .../JavaScriptCore/assembler/X86Assembler.h               | 2 +-
- .../javascriptcore/JavaScriptCore/runtime/JSValue.h       | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
-index ab3d05f..ed5965f 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h
-@@ -2033,7 +2033,7 @@ private:
-             }
-         }
- 
--#if !CPU(X86_64)
-+#if CPU(X86)
-         void memoryModRM(int reg, void* address)
-         {
-             // noBase + ModRmMemoryNoDisp means noBase + ModRmMemoryDisp32!
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
-index 7584c52..958ac89 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
-@@ -490,7 +490,11 @@ namespace JSC {
-             u.asBits.tag = CellTag;
-         else
-             u.asBits.tag = EmptyValueTag;
-+#if CPU(X86)
-         u.asBits.payload = reinterpret_cast<int32_t>(ptr);
-+#else
-+        u.asBits.payload = reinterpret_cast<int64_t>(ptr);
-+#endif
- #if ENABLE(JSC_ZOMBIES)
-         ASSERT(!isZombie());
- #endif
-@@ -502,7 +506,11 @@ namespace JSC {
-             u.asBits.tag = CellTag;
-         else
-             u.asBits.tag = EmptyValueTag;
-+#if CPU(X86)
-         u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
-+#else
-+        u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr));
-+#endif
- #if ENABLE(JSC_ZOMBIES)
-         ASSERT(!isZombie());
- #endif
--- 
-2.17.1
-