Update to Qt 5.15.2

Signed-off-by: Jani Suonpera <jani.suonpera@qt.io>
Change-Id: I5992e74cf524f9378dab64503345111b1cc159f2

recipes-qt/qt5/nativesdk-qtbase_git.bb

@@ -36,12 +36,10 @@ SRC_URI += "\
     file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
     file://0013-Disable-ltcg-for-host_build.patch \
     file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
     file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
     file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
     file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -197,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
 do_generate_qt_environment_file[umask] = "022"
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"

recipes-qt/qt5/ogl-runtime_git.bb

@@ -9,10 +9,10 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
 
-QT_MODULE_BRANCH = "2.7"
+QT_MODULE_BRANCH = "master"
 QT_MODULE_BRANCH_EASTL = "master"
 QT_GIT_PROJECT = "qt3dstudio"
-PV = "2.7.0+git${SRCPV}"
+PV = "2.8.0+git${SRCPV}"
 
 COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm|powerpc64).*-linux"
 
@@ -22,7 +22,7 @@ SRC_URI += " \
     file://0001-Qt3DSSimpleTypes-make-QT3DSU64-as-unsigned-long-on-l.patch \
 "
 
-SRCREV_ogl-runtime = "b9b52349d0df29e2eaa30dd13644b9f42d9e4f3e"
+SRCREV_ogl-runtime = "b53aeb784f950d7b2a5ebe38ea37c5bb6f456c9c"
 SRCREV_EASTL = "31697c758f2ed19bd7c6bbe61f1b91f9e12035b5"
 SRCREV = "${SRCREV_ogl-runtime}"
 

recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch

@@ -28,6 +28,7 @@ index c5232e116..cf5345352 100644
 +    sub_tools.depends -= sub_src
 +    SUBDIRS = sub_tools
 +}
+\ No newline at end of file
 diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
 index 8ba2d9a41..e973d93dd 100644
 --- a/src/3rdparty/assimp/assimp_dependency.pri

recipes-qt/qt5/qt3d_git.bb

@@ -36,6 +36,6 @@ do_configure_prepend() {
          ${S}/src/quick3d/imports/input/importsinput.pro
 }
 
-SRCREV = "d1e6bd43de4883c7e40ca0efc10ff4735ba766c5"
+SRCREV = "34171b1d99f55fde1627df3c57eed50480ab2ae7"
 
 BBCLASSEXTEND += "native nativesdk"

recipes-qt/qt5/qt5-git.inc

@@ -2,7 +2,7 @@
 # Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.15"
+QT_MODULE_BRANCH ?= "5.15.2"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 
 # each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
 
 S = "${WORKDIR}/git"
 
-PV = "5.15.0+git${SRCPV}"
+PV = "5.15.2+git${SRCPV}"

recipes-qt/qt5/qtbase-native_git.bb

@@ -31,12 +31,10 @@ SRC_URI += "\
     file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
     file://0013-Disable-ltcg-for-host_build.patch \
     file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
     file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
     file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
     file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -144,4 +142,4 @@ do_install() {
     echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
 }
 
-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"

recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch

@@ -1,4 +1,4 @@
-From 8442f94819458c79a88ad6177207c0e922a007bd Mon Sep 17 00:00:00 2001
+From c97da220d95091386724e1eadc360ed16ed52dfe Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -65,10 +65,10 @@ index 934a18a924..0f5b1b6333 100644
              msg = "test $$1 succeeded"
              write_file($$QMAKE_CONFIG_LOG, msg, append)
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 99b7fe6562..1ddfddb2bd 100644
+index 69d1954306..37f7c9c4a2 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) {
+@@ -151,7 +151,7 @@ import_plugins:qtConfig(static) {
              plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
              plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
              isEmpty(plug_path): \
@@ -77,7 +77,7 @@ index 99b7fe6562..1ddfddb2bd 100644
              LIBS += $$plug_path/$$plug_type/$$plug_name
          } else {
              LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-@@ -271,8 +271,8 @@ for(ever) {
+@@ -274,8 +274,8 @@ for(ever) {
  # static builds: link qml import plugins into the target.
  contains(all_qt_module_deps, qml): \
          qtConfig(static):import_plugins:!host_build:!no_import_scan {

recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch

@@ -1,4 +1,4 @@
-From 56eb22b1063d9bbdcf6ec39828e4c3498b72c99c Mon Sep 17 00:00:00 2001
+From 44e37eab48ff04bd20815fd4ae0b5d79d493aabc Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <denys@ti.com>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
 Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index e775bf046e..a20eded987 100644
+index 49755f7abf..f84862d1ca 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -876,10 +876,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -883,10 +883,10 @@ defineTest(qtConfOutput_preparePaths) {
 
      $${currentConfig}.output.qconfigSource = \
          "/* Installation Info */" \

recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch

@@ -1,4 +1,4 @@
-From c4393e037ebfc6bfa1a58ceab29fdb78389cd47e Mon Sep 17 00:00:00 2001
+From 18904a169397f343e75bee5f29fa9ae1444a295f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -36,7 +36,7 @@ index 19b3289390..4d0cdf8b5f 100644
              QMetaType info(tp);
              if (!info.isValid()) {
 diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
-index 6dd390ccbd..43b92606d9 100644
+index e397e80fe0..cdb7893e56 100644
 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 @@ -78,6 +78,7 @@
@@ -46,8 +46,8 @@ index 6dd390ccbd..43b92606d9 100644
 +#include <sched.h>
  #endif
 
- #include "private/qhostinfo_p.h"
-@@ -2199,8 +2200,8 @@ public slots:
+ #include <memory>
+@@ -2200,8 +2201,8 @@ public slots:
 
  #if defined(Q_OS_MAC)
          pthread_yield_np();

recipes-qt/qt5/qtbase/0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch

@@ -1,4 +1,4 @@
-From 557aa4d5584525cca4efcf20d6a86ad3ae99e36b Mon Sep 17 00:00:00 2001
+From 6c9e68cffb15cc1e848ca57ea12d4e5905d46507 Mon Sep 17 00:00:00 2001
 From: Nicola Lunghi <nick83ola@gmail.com>
 Date: Wed, 5 Feb 2020 15:32:25 +0000
 Subject: [PATCH] tst_qpainter: FE_ macros are not defined for every platform
@@ -13,10 +13,10 @@ Upstream-Status: submitted [https://codereview.qt-project.org/c/qt/qtbase/+/2894
  1 file changed, 37 insertions(+), 13 deletions(-)
 
 diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-index 45798cc527..de3f156cae 100644
+index 42e98ce363..0ca9b87f04 100644
 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
 +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
-@@ -2894,19 +2894,43 @@ void tst_QPainter::monoImages()
+@@ -2931,19 +2931,43 @@ void tst_QPainter::monoImages()
  #if !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__)
  #include <fenv.h>
 
@@ -67,7 +67,7 @@ index 45798cc527..de3f156cae 100644
          return QLatin1String("Invalid operation");
      return QLatin1String("No exception");
  }
-@@ -2932,7 +2956,7 @@ private:
+@@ -2969,7 +2993,7 @@ private:
 
  void fpe_rasterizeLine_task232012()
  {
@@ -76,7 +76,7 @@ index 45798cc527..de3f156cae 100644
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
      img.fill(0x0);
      QPainter p(&img);
-@@ -2944,7 +2968,7 @@ void fpe_rasterizeLine_task232012()
+@@ -2981,7 +3005,7 @@ void fpe_rasterizeLine_task232012()
 
  void fpe_pixmapTransform()
  {
@@ -85,7 +85,7 @@ index 45798cc527..de3f156cae 100644
 
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -2972,7 +2996,7 @@ void fpe_pixmapTransform()
+@@ -3009,7 +3033,7 @@ void fpe_pixmapTransform()
 
  void fpe_zeroLengthLines()
  {
@@ -94,7 +94,7 @@ index 45798cc527..de3f156cae 100644
 
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -2984,7 +3008,7 @@ void fpe_zeroLengthLines()
+@@ -3021,7 +3045,7 @@ void fpe_zeroLengthLines()
 
  void fpe_divByZero()
  {
@@ -103,7 +103,7 @@ index 45798cc527..de3f156cae 100644
 
      QImage img(128, 128, QImage::Format_ARGB32_Premultiplied);
 
-@@ -3007,7 +3031,7 @@ void fpe_divByZero()
+@@ -3044,7 +3068,7 @@ void fpe_divByZero()
 
  void fpe_steepSlopes()
  {
@@ -112,7 +112,7 @@ index 45798cc527..de3f156cae 100644
 
      QImage img(1024, 1024, QImage::Format_ARGB32_Premultiplied);
 
-@@ -3026,7 +3050,7 @@ void fpe_steepSlopes()
+@@ -3063,7 +3087,7 @@ void fpe_steepSlopes()
 
  void fpe_radialGradients()
  {

recipes-qt/qt5/qtbase_git.bb

@@ -27,12 +27,10 @@ SRC_URI += "\
     file://0009-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \
     file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
-    file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \
     file://0013-Disable-ltcg-for-host_build.patch \
     file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
     file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
     file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
-    file://0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch \
     file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \
     file://0019-Define-__NR_futex-if-it-does-not-exist.patch \
 "
@@ -60,6 +58,7 @@ PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev evdev widgets tools libs freet
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'qt5-static', 'static', '', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
 "
 
 PACKAGECONFIG ?= " \
@@ -181,7 +180,6 @@ LDFLAGS_append_riscv64 = " -pthread"
 
 QT_CONFIG_FLAGS += " \
     ${QT_CONFIG_FLAGS_GOLD} \
-    -shared \
     -silent \
     -no-pch \
     -no-rpath \
@@ -304,4 +302,4 @@ sed -i \
     $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
 }
 
-SRCREV = "f6fe4bbab7c0a390b96098b1ccf2373547a4baf9"
+SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28"