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

* qtyocto/5.13:
  7d0ec75 Merge remote-tracking branch 'qtyocto/5.12' into 5.13
  c1deb9a ogl-runtime: Fix format-security issues
  1716c29 qt5: update to Qt 5.13.1
  e0cee22 ogl-runtime: fix build errors
  9978929 qtvirtualkeyboard: update supported layouts
  584d866 qtcoap: add optional dependency to qtdeclarative
  54a8456 qttranslations: qmlviewer and qtquick1 helps are removed
  e33d860 qt3d-runtime: update to ogl-runtime v2.4
  364eb06 Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
  0aff334 qtbase: update module
  be7aa4b qtbase: update module
  b4061d6 qtbase, qttools: update modules
  2d768e8 qt5: update submodules
  bf46332 qt5: update submodules
  bbe412d qt5: update submodules
  67a74e2 qtbase: fix typo in imageformats packageconfig
  a28765b Allow enabling gui for native and nativesdk
  e172b87 qt5: update submodules
  2a5f941 qtbase: fix build with gcc-9
  8bc72a7 qtlocation: add PACKAGECONFIGs for geoservices
  46c87e0 qmake5_base.bbclass: Don't expand find -name search patterns
  c96f9b3 qt5: update submodules

Conflicts:
  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  recipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdatavis3d_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtgamepad_git.bb
  recipes-qt/qt5/qtgraphicaleffects_git.bb
  recipes-qt/qt5/qtimageformats_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtlottie_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtnetworkauth_git.bb
  recipes-qt/qt5/qtpurchasing_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtscript_git.bb
  recipes-qt/qt5/qtscxml_git.bb
  recipes-qt/qt5/qtsensors_git.bb
  recipes-qt/qt5/qtserialbus_git.bb
  recipes-qt/qt5/qtserialport_git.bb
  recipes-qt/qt5/qtsvg_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qttranslations_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebchannel_git.bb
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebglplugin_git.bb
  recipes-qt/qt5/qtwebsockets_git.bb
  recipes-qt/qt5/qtwebview_git.bb
  recipes-qt/qt5/qtx11extras_git.bb
  recipes-qt/qt5/qtxmlpatterns_git.bb

Change-Id: I85e1f23a2c1de6c0996ef166535b9c6a12766806

19 files changed, 262 insertions, 46 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index be8707eb..412c0050 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared
-# 5.12.meta-qt5-shared.7
+# 5.12.meta-qt5-shared.8
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -45,10 +45,10 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native
-# 5.12.meta-qt5-native.7
+# 5.12.meta-qt5-native.8
 SRC_URI += " \
-    file://0017-Always-build-uic-and-qvkgen.patch \
-    file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \
+    file://0018-Always-build-uic-and-qvkgen.patch \
+    file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \
 "
 
 # CMake's toolchain configuration of nativesdk-qtbase
@@ -65,6 +65,7 @@ FILES_${PN}-dev += " \
 
 FILES_${PN} += " \
     ${SDKPATHNATIVE}/environment-setup.d \
+    ${OE_QMAKE_PATH_PLUGINS} \
 "
 
 # qttools binaries are placed in a subdir of bin in order to avoid
@@ -73,6 +74,10 @@ FILES_${PN} += " \
 # disable package auto-renaming for the tools-package.
 DEBIAN_NOAUTONAME_${PN} = "1"
 
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui,"
+PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
+
 QT_CONFIG_FLAGS += " \
     -shared \
     -silent \
@@ -101,12 +106,8 @@ do_configure() {
         -no-gcc-sysroot \
         -system-zlib \
         -dbus-runtime \
-        -no-libjpeg \
-        -no-libpng \
-        -no-gif \
         -no-accessibility \
         -no-cups \
-        -no-gui \
         -no-sql-mysql \
         -no-sql-sqlite \
         -no-opengl \
@@ -148,7 +149,6 @@ do_install() {
 
     # remove things unused in nativesdk, we need the headers and libs
     rm -rf ${D}${datadir} \
-           ${D}/${OE_QMAKE_PATH_PLUGINS} \
            ${D}${libdir}/cmake \
            ${D}${libdir}/pkgconfig
 
diff --git a/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch
new file mode 100644
index 00000000..0d2f165f
--- /dev/null
+++ b/recipes-qt/qt5/ogl-runtime/0001-Fix-examples-build-error.patch
@@ -0,0 +1,62 @@
+From 4fa69c1c5396bded20edccb2a1dd9b61f0b1140d Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Fri, 2 Aug 2019 12:39:50 +0300
+Subject: [PATCH] Fix examples build error
+
+Add workaround for QTBUG-77288 which causes examples to fail to build
+
+Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
+---
+ examples/studio3d/cppdatainput/cppdatainput.pro     | 1 +
+ examples/studio3d/dynamicelement/dynamicelement.pro | 1 +
+ examples/studio3d/qmldatainput/qmldatainput.pro     | 1 +
+ examples/studio3d/simpleqml/simpleqml.pro           | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/examples/studio3d/cppdatainput/cppdatainput.pro b/examples/studio3d/cppdatainput/cppdatainput.pro
+index 20b5c68..bbb403a 100644
+--- a/examples/studio3d/cppdatainput/cppdatainput.pro
++++ b/examples/studio3d/cppdatainput/cppdatainput.pro
+@@ -1,5 +1,6 @@
+ CONFIG += c++11
+ QT += widgets qml quick studio3d
++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
+ 
+ target.path = $$[QT_INSTALL_EXAMPLES]/studio3d/$$TARGET
+ INSTALLS += target
+diff --git a/examples/studio3d/dynamicelement/dynamicelement.pro b/examples/studio3d/dynamicelement/dynamicelement.pro
+index 1b804fd..ae3c005 100644
+--- a/examples/studio3d/dynamicelement/dynamicelement.pro
++++ b/examples/studio3d/dynamicelement/dynamicelement.pro
+@@ -1,6 +1,7 @@
+ TEMPLATE = app
+ 
+ QT += qml quick studio3d
++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
+ 
+ SOURCES += \
+         demo.cpp \
+diff --git a/examples/studio3d/qmldatainput/qmldatainput.pro b/examples/studio3d/qmldatainput/qmldatainput.pro
+index 9bafed5..496c2c1 100644
+--- a/examples/studio3d/qmldatainput/qmldatainput.pro
++++ b/examples/studio3d/qmldatainput/qmldatainput.pro
+@@ -1,6 +1,7 @@
+ TEMPLATE = app
+ 
+ QT += widgets qml quick studio3d
++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
+ 
+ integrity: DEFINES += USE_EMBEDDED_FONTS
+ 
+diff --git a/examples/studio3d/simpleqml/simpleqml.pro b/examples/studio3d/simpleqml/simpleqml.pro
+index 62afa78..1a0784b 100644
+--- a/examples/studio3d/simpleqml/simpleqml.pro
++++ b/examples/studio3d/simpleqml/simpleqml.pro
+@@ -1,6 +1,7 @@
+ TEMPLATE = app
+ 
+ QT += widgets qml quick studio3d
++QMAKE_LIBS += $$QMAKE_LIBS_3DSQMLSTREAMER $$QMAKE_LIBS_3DSOPENGL
+ 
+ SOURCES += \
+     main.cpp
diff --git a/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch
new file mode 100644
index 00000000..fcf6915d
--- /dev/null
+++ b/recipes-qt/qt5/ogl-runtime/0002-Fix-format-security-issues.patch
@@ -0,0 +1,75 @@
+From c80b588cc3e11a80ffedd778fab3f19c686552f7 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Mon, 5 Aug 2019 14:24:44 +0300
+Subject: [PATCH] Fix format-security issues
+
+format not a string literal and no format arguments [-Wformat-security]
+
+Change-Id: I04c1d1598948b664b9d85036030c6f89fcf3c8b7
+---
+ src/render/backends/gl/Q3DSRenderBackendGLES2.cpp   | 4 ++--
+ src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp | 8 ++++----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
+index ac5b992..02046ac 100644
+--- a/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
++++ b/src/render/backends/gl/Q3DSRenderBackendGLES2.cpp
+@@ -663,7 +663,7 @@ NVRenderBackendGLES2Impl::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum s
+     // check for error
+     GLenum error = m_glFunctions->glGetError();
+     if (error != GL_NO_ERROR) {
+-        qCCritical(GL_ERROR, GLConversion::processGLError(error));
++        qCCritical(GL_ERROR) << GLConversion::processGLError(error);
+         QT3DS_ASSERT(false);
+         GL_CALL_EXTRA_FUNCTION(glDeleteRenderbuffers(1, &bufID));
+         bufID = 0;
+@@ -699,7 +699,7 @@ bool NVRenderBackendGLES2Impl::ResizeRenderbuffer(NVRenderBackendRenderbufferObj
+     // check for error
+     GLenum error = m_glFunctions->glGetError();
+     if (error != GL_NO_ERROR) {
+-        qCCritical(GL_ERROR, GLConversion::processGLError(error));
++        qCCritical(GL_ERROR) << GLConversion::processGLError(error);
+         QT3DS_ASSERT(false);
+         success = false;
+     }
+diff --git a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
+index 0fe6e0f..5dfe9d1 100644
+--- a/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
++++ b/src/render/backends/gl/Qt3DSRenderBackendGLBase.cpp
+@@ -604,7 +604,7 @@ NVRenderBackendGLBase::CreateBuffer(size_t size, NVRenderBufferBindFlags bindFla
+         } else {
+             GL_CALL_FUNCTION(glDeleteBuffers(1, &bufID));
+             bufID = 0;
+-            qCCritical(GL_ERROR, GLConversion::processGLError(target));
++            qCCritical(GL_ERROR) << GLConversion::processGLError(target);
+         }
+     }
+ 
+@@ -832,7 +832,7 @@ NVRenderBackendGLBase::CreateRenderbuffer(NVRenderRenderBufferFormats::Enum stor
+     // check for error
+     GLenum error = m_glFunctions->glGetError();
+     if (error != GL_NO_ERROR) {
+-        qCCritical(GL_ERROR, GLConversion::processGLError(error));
++        qCCritical(GL_ERROR) << GLConversion::processGLError(error);
+         QT3DS_ASSERT(false);
+         GL_CALL_FUNCTION(glDeleteRenderbuffers(1, &bufID));
+         bufID = 0;
+@@ -869,7 +869,7 @@ bool NVRenderBackendGLBase::ResizeRenderbuffer(NVRenderBackendRenderbufferObject
+     // check for error
+     GLenum error = m_glFunctions->glGetError();
+     if (error != GL_NO_ERROR) {
+-        qCCritical(GL_ERROR, GLConversion::processGLError(error));
++        qCCritical(GL_ERROR) << GLConversion::processGLError(error);
+         QT3DS_ASSERT(false);
+         success = false;
+     }
+@@ -1306,7 +1306,7 @@ bool NVRenderBackendGLBase::compileSource(GLuint shaderID, NVConstDataRef<QT3DSI
+         GLenum binaryError = m_glFunctions->glGetError();
+         if (binaryError != GL_NO_ERROR) {
+             shaderStatus = GL_FALSE;
+-            qCCritical(GL_ERROR, GLConversion::processGLError(binaryError));
++            qCCritical(GL_ERROR) << GLConversion::processGLError(binaryError);
+         }
+     }
+ 
diff --git a/recipes-qt/qt5/ogl-runtime_git.bb b/recipes-qt/qt5/ogl-runtime_git.bb
new file mode 100644
index 00000000..ecc8ba2b
--- /dev/null
+++ b/recipes-qt/qt5/ogl-runtime_git.bb
@@ -0,0 +1,27 @@
+require qt5.inc
+require qt5-git.inc
+
+LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
+
+QT_MODULE_BRANCH = "2.4"
+QT_MODULE_BRANCH_EASTL = "master"
+QT_GIT_PROJECT = "qt3dstudio"
+PV = "2.4+git${SRCPV}"
+
+SRC_URI += " \
+    ${QT_GIT}/qt3dstudio-eastl.git;name=EASTL;branch=${QT_MODULE_BRANCH_EASTL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/EASTL \
+    file://0001-Fix-examples-build-error.patch \
+    file://0002-Fix-format-security-issues.patch \
+"
+
+SRCREV_ogl-runtime = "a41270dced230d90e0e07f2ebb880e4f97317a7f"
+SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
+SRCREV = "${SRCREV_ogl-runtime}"
+
+SRCREV_FORMAT = "ogl-runtime_EASTL"
diff --git a/recipes-qt/qt5/qt3d-runtime_git.bb b/recipes-qt/qt5/qt3d-runtime_git.bb
deleted file mode 100644
index fb018e58..00000000
--- a/recipes-qt/qt5/qt3d-runtime_git.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require qt5.inc
-require qt5-git.inc
-
-LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-"
-
-DEPENDS += "qtbase qtdeclarative qt3d"
-
-QT_MODULE_BRANCH = "2.3"
-QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.3+git${SRCPV}"
-
-SRCREV = "5e0bfe934b9930b7e41d457b4f88fce91342a0ea"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index b31c5cab..cd22fe24 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -18,7 +18,7 @@ require qt5-git.inc
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared
-# 5.12.meta-qt5-shared.7
+# 5.12.meta-qt5-shared.8
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -40,15 +40,15 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native
-# 5.12.meta-qt5-native.7
+# 5.12.meta-qt5-native.8
 SRC_URI += " \
-    file://0017-Always-build-uic-and-qvkgen.patch \
-    file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \
+    file://0018-Always-build-uic-and-qvkgen.patch \
+    file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \
 "
 
 # only for qtbase-native
 SRC_URI += " \
-    file://0019-Bootstrap-without-linkat-feature.patch \
+    file://0020-Bootstrap-without-linkat-feature.patch \
 "
 
 CLEANBROKEN = "1"
@@ -56,18 +56,18 @@ CLEANBROKEN = "1"
 XPLATFORM_toolchain-clang = "linux-oe-clang"
 XPLATFORM ?= "linux-oe-g++"
 
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[gui] = "-gui -qpa minimal,-no-gui,"
+PACKAGECONFIG[imageformats] = "-qt-libpng -qt-libjpeg -gif -ico, -no-libpng -no-libjpeg -no-ico -no-gif,"
+
 QT_CONFIG_FLAGS = " \
     -sysroot ${STAGING_DIR_NATIVE} \
     -L${STAGING_LIBDIR_NATIVE} \
     -no-gcc-sysroot \
     -system-zlib \
     -qt-pcre \
-    -no-libjpeg \
-    -no-libpng \
-    -no-gif \
     -no-accessibility \
     -no-cups \
-    -no-gui \
     -no-sql-mysql \
     -no-sql-sqlite \
     -no-sql-psql \
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
index e275a80e..e0591d2a 100644
--- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
+++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
-From ffd62d10df5607897ef366330e368069fed1a9b9 Mon Sep 17 00:00:00 2001
+From a080cb3ac2ad24aeb73407c772ed560dc4cb7ef5 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 23 Oct 2018 09:54:57 +0300
 Subject: [PATCH] Disable ltcg for host_build
@@ -15,12 +15,14 @@ Upstream-Status: Inappropriate [embedded specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
-index ccf0226272..482e5b573d 100644
+index a94f6d0eeb..3cb01c334d 100644
 --- a/mkspecs/features/ltcg.prf
 +++ b/mkspecs/features/ltcg.prf
-@@ -1,4 +1,4 @@
--CONFIG(release, debug|release) {
-+CONFIG(release, debug|release):!host_build {
+@@ -1,6 +1,6 @@
+ static:no-static-ltcg {
+     # Static library but no-static-ltcg enabled: skip LTCG
+-} else: CONFIG(release, debug|release) {
++} else: CONFIG(release, debug|release):!host_build {
      # We need fat object files when creating static libraries on some platforms
      # so the linker will know to load a particular object from the library
      # in the first place. On others, we have special ar and nm to create the symbol
diff --git a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
index 69410925..7ae15d0a 100644
--- a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch
+++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch
@@ -1,4 +1,4 @@
-From 4b0ca5d85afd944d1e5a3df545ba99566207c184 Mon Sep 17 00:00:00 2001
+From 0db28cf06f557a714f8cffafbfcdbe68378c8f8a Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH] Always build uic and qvkgen
diff --git a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
index 0ca038f5..b3c2c767 100644
--- a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch
+++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
@@ -1,4 +1,4 @@
-From 69aeac9c7233e0d76a8a00b1a45c53c1670c9b49 Mon Sep 17 00:00:00 2001
+From 0c79a6761e75441f433fd397bc3b79e78b6c5ef8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
 Date: Sun, 14 Apr 2019 13:27:58 +0200
 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds
diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
index a1d08236..e681bfbb 100644
--- a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch
+++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch
@@ -1,4 +1,4 @@
-From 703f89e35aaaec5ad781c222ae2dcd30f31320e9 Mon Sep 17 00:00:00 2001
+From d52010c7d58f1a25f51a909b3179df656ed9d9c4 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 24 Nov 2017 15:16:31 +0200
 Subject: [PATCH] Bootstrap without linkat feature
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index b925d573..9c8eae83 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared
-# 5.12.meta-qt5-shared.7
+# 5.12.meta-qt5-shared.8
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
index 1840d52d..8c61cee1 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
 "
 
+PACKAGECONFIG ?= "qtdeclarative"
+PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
+
 DEPENDS += "qtbase"
 
 SRCREV = "838cfa5aec4c02f5e865fc470c10cc50eb42f2c8"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch
new file mode 100644
index 00000000..d2bac1f7
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch
@@ -0,0 +1,36 @@
+From 5ae643e2ab69892e0dbe296cf14e020c7938ebee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=B6rg=20Bornemann?= <joerg.bornemann@qt.io>
+Date: Fri, 2 Aug 2019 11:03:06 +0000
+Subject: [PATCH] Revert "Yield error if qtquickcompiler is used in non-QML
+ projects"
+
+This reverts commit c5578b16d6454e708c8ce12661a85d41eeaaa758, because
+it prevents enabling the qtquickcompiler feature globally.
+
+Fixes: QTBUG-77277
+Change-Id: Ic80835c462570a67ae3105bb3d1b6452800d2c94
+Reviewed-by: Kai Koehne <kai.koehne@qt.io>
+---
+ tools/qmlcachegen/qtquickcompiler.prf | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
+index 967d55a5b..b98d8a019 100644
+--- a/tools/qmlcachegen/qtquickcompiler.prf
++++ b/tools/qmlcachegen/qtquickcompiler.prf
+@@ -1,15 +1,5 @@
+ if(qtc_run|lupdate_run): return()
+ 
+-!contains(QT, qml) {
+-    qt_modules = \
+-        $$replace(QT, -private$, _private) \
+-        $$replace(QT_PRIVATE, -private$, _private)
+-    qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends")
+-    !contains(qt_modules, qml): \
+-        error("The qtquickcompiler feature cannot be used without the QML module.")
+-    unset(qt_modules)
+-}
+-
+ qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER)
+ qtPrepareTool(QMAKE_RCC, rcc, _DEP)
+ 
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 19499e38..df86188b 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -14,6 +14,8 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
+SRC_URI += "file://0001-Revert-Yield-error-if-qtquickcompiler-is-used-in-non.patch"
+
 PACKAGECONFIG ??= "qml-debug qml-network ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)}"
 PACKAGECONFIG[qml-debug] = "-qml-debug,-no-qml-debug"
 PACKAGECONFIG[qml-network] = "-qml-network, -no-qml-network"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 76a89e04..440b3c9a 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -17,6 +17,11 @@ PACKAGECONFIG ??= ""
 # older geoclue 0.12.99 is needed
 PACKAGECONFIG[geoclue] = ",,geoclue"
 PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
+PACKAGECONFIG[geoservices_here] = "-feature-geoservices_here,-no-feature-geoservices_here"
+PACKAGECONFIG[geoservices_mapbox] = "-feature-geoservices_mapbox,-no-feature-geoservices_mapbox"
+PACKAGECONFIG[geoservices_esri] = "-feature-geoservices_esri,-no-feature-geoservices_esri"
+PACKAGECONFIG[geoservices_itemsoverlay] = "-feature-geoservices_itemsoverlay,-no-feature-geoservices_itemsoverlay"
+PACKAGECONFIG[geoservices_osm] = "-feature-geoservices_osm,-no-feature-geoservices_osm"
 PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
diff --git a/recipes-qt/qt5/qttools/run-ptest b/recipes-qt/qt5/qttools/run-ptest
index 5cd5e27e..ae671a72 100644
--- a/recipes-qt/qt5/qttools/run-ptest
+++ b/recipes-qt/qt5/qttools/run-ptest
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 ./tst_qtdiag
-./tst_qtattributionsscanner
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index b63c6b1d..f2fe0635 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -40,5 +40,4 @@ do_install_ptest() {
     mkdir -p ${D}${PTEST_PATH}
     t=${D}${PTEST_PATH}
     cp ${B}/tests/auto/qtdiag/tst_tdiag $t
-    cp ${B}/tests/auto/qtattributionsscanner/tst_qtattributionsscanner $t
 }
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index de74f4fb..b9e9e4d0 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -10,7 +10,7 @@ DEPENDS += "qtbase qttools-native"
 
 do_install_append() {
     # remove qtquick1 translations - qtquick1 is gone
-    for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qmlviewer_*.qm -o -name qtquick1_*.qm -o -name qt_*.qm ! -name qt_help_*.qm`; do
+    for transfile in `find ${D}/${OE_QMAKE_PATH_TRANSLATIONS} -name qt_*.qm ! -name qt_help_*.qm`; do
         rm $transfile
     done
 }
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index b6e08380..1f7b6879 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -21,23 +21,45 @@ PACKAGECONFIG[t9write] = "CONFIG+=t9write"
 PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
 PACKAGECONFIG[lang-all] = "CONFIG+=lang-all"
 PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR"
+PACKAGECONFIG[lang-bg_BG] = "CONFIG+=lang-bg_BG"
+PACKAGECONFIG[lang-cs_CZ] = "CONFIG+=lang-cs_CZ"
 PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK"
 PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE"
+PACKAGECONFIG[lang-el_GR] = "CONFIG+=lang-el_GR"
 PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB"
+PACKAGECONFIG[lang-en_US] = "CONFIG+=lang-en_US"
 PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES"
+PACKAGECONFIG[lang-es_MX] = "CONFIG+=lang-es_MX"
+PACKAGECONFIG[lang-et_EE] = "CONFIG+=lang-et_EE"
 PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA"
 PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI"
+PACKAGECONFIG[lang-fr_CA] = "CONFIG+=lang-fr_CA"
 PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR"
+PACKAGECONFIG[lang-he_IL] = "CONFIG+=lang-he_IL"
 PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN"
+PACKAGECONFIG[lang-hr_HR] = "CONFIG+=lang-hr_HR"
+PACKAGECONFIG[lang-hu_HU] = "CONFIG+=lang-hu_HU"
+PACKAGECONFIG[lang-id_ID] = "CONFIG+=lang-id_ID"
 PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT"
 PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP"
 PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
+PACKAGECONFIG[lang-ms_MY] = "CONFIG+=lang-ms_MY"
 PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
+PACKAGECONFIG[lang-nl_NL] = "CONFIG+=lang-nl_NL"
 PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
+PACKAGECONFIG[lang-pt_BR] = "CONFIG+=lang-pt_BR"
 PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
 PACKAGECONFIG[lang-ro_RO] = "CONFIG+=lang-ro_RO"
 PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
+PACKAGECONFIG[lang-sk_SK] = "CONFIG+=lang-sk_SK"
+PACKAGECONFIG[lang-sl_SI] = "CONFIG+=lang-sl_SI"
+PACKAGECONFIG[lang-sq_AL] = "CONFIG+=lang-sq_AL"
+PACKAGECONFIG[lang-sr_SP] = "CONFIG+=lang-sr_SP"
 PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
+PACKAGECONFIG[lang-th_TH] = "CONFIG+=lang-th_TH"
+PACKAGECONFIG[lang-tr_TR] = "CONFIG+=lang-tr_TR"
+PACKAGECONFIG[lang-uk_UA] = "CONFIG+=lang-uk_UA"
+PACKAGECONFIG[lang-vi_VN] = "CONFIG+=lang-vi_VN"
 PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
 PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW"