Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13

* qtyocto/upstream/zeus:
  432ad2a qttools: don't install tst_qtattributionsscanner
  8115617 qt5: Upgrade to Qt 5.13.2
  267e646 python(3)-pyqt5: add qml support
  653e12f libqofono: bump SRCREV and add a fix for voicecall
  cefb48e qtbase: Add PACKAGECONFIG for lttng
  911b346 layer: Mark zeus as compatible release
  c373272 ogl-runtime: Fix build on x86_64
  9172ba1 README.md: Document need for 32bit host compiler
  db2fd6c qtwayland: Fix build with clang/libc++
  6b5122e qtbase: Fix build when fp16 is used

Conflicts:
 recipes-qt/qt5/ogl-runtime_git.bb
 recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
 recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
 recipes-qt/qt5/qtbase_git.bb
 recipes-qt/qt5/qtwayland_git.bb

Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7

1 files changed, 2 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
index 838044a1..2864cb81 100644
--- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
+++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch
@@ -1,4 +1,4 @@
-From dd3b3190fd65ac636afd55c1d2e746c9fe7b6df0 Mon Sep 17 00:00:00 2001
+From c39c68f73c86378897dbc6f59b48c2ced1eaa72f Mon Sep 17 00:00:00 2001
 From: Wenlin Kang <wenlin.kang@windriver.com>
 Date: Thu, 8 Sep 2016 12:18:13 +0800
 Subject: [PATCH] qtmultimedia: fix a conflicting declaration
@@ -67,7 +67,7 @@ index 00000000..24236976
 +
 +#endif
 diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
-index 4b68f47a..dade1382 100644
+index e1468fe3..a77a9d6a 100644
 --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
 +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp
 @@ -37,8 +37,9 @@