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, 9 insertions, 1 deletions

diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index 2e0ba464..a0316ae9 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -1,13 +1,21 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "( GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.0"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
     file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
     file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
 "
 
+PACKAGECONFIG ?= "qtdeclarative"
+PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
+
+# src/3rdparty/open62541.pri adds -Wno-format, causing following error
+# because -Wformat-security cannot be used together with -Wno-format
+# cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
+SECURITY_STRINGFORMAT = ""
+
 DEPENDS += "qtbase"
 
 SRCREV = "bad55c664152eef404f7bf908cae0abfdc9a7b46"