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

diff --git a/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
new file mode 100644
index 00000000..14cb8aa4
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch
@@ -0,0 +1,37 @@
+From 83aa5b3265d7c9f64e754cb890988cf8a5669ce7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 24 Sep 2018 02:11:10 -0700
+Subject: [PATCH] PlatformQt.cmake: Do not generate hardcoded include paths
+
+If we do not use this define,then it falls into else case which
+generated .pri files with /usr/include and so on for includes and
+compiler does not like specifying absolute include paths pointing to
+build host includes
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Source/WebKit/PlatformQt.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
+index 9aed9906e..48638aef4 100644
+--- a/Source/WebKit/PlatformQt.cmake
++++ b/Source/WebKit/PlatformQt.cmake
+@@ -512,7 +512,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+     install(FILES ${WebKit_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
+ endif ()
+ 
+-if (KDE_INSTALL_USE_QT_SYS_PATHS)
++if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
+     set(WebKit_PRI_ARGUMENTS
+         BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
+         LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"
+@@ -737,7 +737,7 @@ if (NOT MACOS_BUILD_FRAMEWORKS)
+     install(FILES ${WebKitWidgets_PKGCONFIG_FILENAME} DESTINATION ${ECM_PKGCONFIG_INSTALL_DIR} COMPONENT Data)
+ endif ()
+ 
+-if (KDE_INSTALL_USE_QT_SYS_PATHS)
++if (KDE_INSTALL_USE_QT_SYS_PATHS OR CROSS_COMPILE)
+     set(WebKitWidgets_PRI_ARGUMENTS
+         BIN_INSTALL_DIR "$$QT_MODULE_BIN_BASE"
+         LIB_INSTALL_DIR "$$QT_MODULE_LIB_BASE"