Merge remote-tracking branch 'qtyocto/5.13' into dev

* qtyocto/5.13: (46 commits)
  qtwayland: update module
  qt5: update submodules
  qt5: update submodules
  qt3d-runtime: update to v2.3
  qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
  qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
  qtbase: add libxext dependency for xcb PACKAGECONFIG
  python-pyqt5: Update to version 5.12.1.
  python-pyqt: Fix annoying problems.
  qtwebengine: arm: use OE specified -mcpu option
  Revert "qtbase: Adjust target mkspec settings"
  qtbase-tools: Fix error during pkg_postinst
  qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
  qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
  qtwayland: check also that the destination for private headers exists before installing them
  qtwayland: improve manual header installation
  qtwayland: workaround upstream bug: install missing headers manually
  qtwayland: disable gold for all archs like in qtbase
  qt5: upgrade to 5.12.3
  qtbase: disable gold for all archs not just x86
  ...

Change-Id: I43d594b17bfeadc102a8817285c5834062e9cd75

1 files changed, 66 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
new file mode 100644
index 00000000..0a641bb2
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
@@ -0,0 +1,66 @@
+From f5c88622ac10601e48a14f31d9299692a9ac62e2 Mon Sep 17 00:00:00 2001
+From: Max Krummenacher <max.krummenacher@toradex.com>
+Date: Sat, 27 Oct 2018 12:29:31 +0000
+Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to
+ sysroot
+
+EGL is configured to need an include path into the recipe-specific sysroot.
+However users of the cmake file will have a different absolute path than that
+used when creating the cmake file from cmake.in in qtbase.
+
+Change to store the relative path within the sysroot and then prepend the
+currently used sysroot in the _qt5gui_find_extra_libs macro.
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
+---
+ src/gui/Qt5GuiConfigExtras.cmake.in | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
+index 84dbbfebd4..ad6956d814 100644
+--- a/src/gui/Qt5GuiConfigExtras.cmake.in
++++ b/src/gui/Qt5GuiConfigExtras.cmake.in
+@@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
+ 
+ macro(_qt5gui_find_extra_libs Name Libs LibDir IncDirs)
+     set(Qt5Gui_${Name}_LIBRARIES)
+-!!IF !mac
+-    set(Qt5Gui_${Name}_INCLUDE_DIRS ${IncDirs})
+-!!ELSE
++
+     foreach(_dir ${IncDirs})
+-      if (EXISTS ${_dir})
+-        list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_dir})
+-      else()
+-        find_path(_actual_dir ${_dir}) # Look in sdk directories
+-        if (_actual_dir)
+-          list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir})
+-        endif()
+-        unset(_actual_dir CACHE)
++      find_path(_actual_dir ${_dir})
++      if (_actual_dir)
++        list(APPEND Qt5Gui_${Name}_INCLUDE_DIRS ${_actual_dir})
+       endif()
++      unset(_actual_dir CACHE)
+     endforeach()
+-!!ENDIF
++
+     foreach(_lib ${Libs})
+         if (IS_ABSOLUTE ${_lib})
+             get_filename_component(_libFile ${_lib} NAME_WE)
+@@ -171,11 +165,11 @@ endmacro()
+ 
+ 
+ !!IF !isEmpty(CMAKE_EGL_LIBS)
+-_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$CMAKE_EGL_INCDIRS\")
++_qt5gui_find_extra_libs(EGL \"$$CMAKE_EGL_LIBS\" \"$$CMAKE_EGL_LIBDIR\" \"$$replace(CMAKE_EGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\")
+ !!ENDIF
+ 
+ !!IF !isEmpty(CMAKE_OPENGL_LIBS)
+-_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$CMAKE_OPENGL_INCDIRS\")
++_qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\" \"$$replace(CMAKE_OPENGL_INCDIRS,$$re_escape($$PKG_CONFIG_SYSROOT_DIR),)\")
+ 
+ !!ENDIF
+