summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb3
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch29
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb3
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch32
-rw-r--r--recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch371
-rw-r--r--recipes-qt/qt5/qtbase_git.bb3
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb14
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtcoap_git.bb14
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtknx_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb12
-rw-r--r--recipes-qt/qt5/qtmqtt_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtopcua_git.bb9
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch22
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch33
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch50
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch18
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch30
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb9
-rw-r--r--recipes-qt/qt5/qtwebglplugin_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
51 files changed, 136 insertions, 592 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 020ada23..1727fbb9 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -41,7 +41,6 @@ SRC_URI += "\
41 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 41 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
42 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 42 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
43 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 43 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
44 file://0017-Fix-Wdeprecated-copy-warnings.patch \
45" 44"
46 45
47# common for qtbase-native and nativesdk-qtbase 46# common for qtbase-native and nativesdk-qtbase
@@ -194,4 +193,4 @@ fakeroot do_generate_qt_environment_file() {
194do_generate_qt_environment_file[umask] = "022" 193do_generate_qt_environment_file[umask] = "022"
195addtask generate_qt_environment_file after do_install before do_package 194addtask generate_qt_environment_file after do_install before do_package
196 195
197SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" 196SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index b1e662bc..05a86a70 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,26 +1,24 @@
1From 98509dbb66b3d93cdb6ca73cb5db537fa8ff8bd3 Mon Sep 17 00:00:00 2001 1From 1e64f9b509e6794c6f01e62443e93f771ac2a65c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 17 Aug 2018 13:23:58 +0300 3Date: Fri, 17 Aug 2018 13:23:58 +0300
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
5 5
6--- 6---
7 qt3d.pro | 9 +++++++-- 7 qt3d.pro | 7 ++++++-
8 src/3rdparty/assimp/assimp_dependency.pri | 2 +- 8 src/3rdparty/assimp/assimp_dependency.pri | 2 +-
9 tools/tools.pro | 2 +- 9 tools/tools.pro | 4 ++--
10 3 files changed, 9 insertions(+), 4 deletions(-) 10 3 files changed, 9 insertions(+), 4 deletions(-)
11 11
12diff --git a/qt3d.pro b/qt3d.pro 12diff --git a/qt3d.pro b/qt3d.pro
13index 847507f17..286286dd0 100644 13index d5dbda4..6809470 100644
14--- a/qt3d.pro 14--- a/qt3d.pro
15+++ b/qt3d.pro 15+++ b/qt3d.pro
16@@ -1,5 +1,5 @@ 16@@ -1,4 +1,4 @@
17-requires(qtHaveModule(gui)) 17-qtHaveModule(gui): \
18-requires(qtConfig(opengl):!wasm) 18+!tools-only:qtHaveModule(gui): \
19+!tools-only:requires(qtHaveModule(gui)) 19 requires(qtConfig(opengl):!wasm)
20+!tools-only:requires(qtConfig(opengl):!wasm)
21 20
22 CONFIG += examples_need_tools 21 CONFIG += examples_need_tools
23 load(qt_parts)
24@@ -15,3 +15,8 @@ load(qt_parts) 22@@ -15,3 +15,8 @@ load(qt_parts)
25 23
26 OTHER_FILES += \ 24 OTHER_FILES += \
@@ -31,7 +29,7 @@ index 847507f17..286286dd0 100644
31+ SUBDIRS = sub_tools 29+ SUBDIRS = sub_tools
32+} 30+}
33diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri 31diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri
34index 8ba2d9a41..e973d93dd 100644 32index 8ba2d9a..e973d93 100644
35--- a/src/3rdparty/assimp/assimp_dependency.pri 33--- a/src/3rdparty/assimp/assimp_dependency.pri
36+++ b/src/3rdparty/assimp/assimp_dependency.pri 34+++ b/src/3rdparty/assimp/assimp_dependency.pri
37@@ -1,5 +1,5 @@ 35@@ -1,5 +1,5 @@
@@ -42,11 +40,16 @@ index 8ba2d9a41..e973d93dd 100644
42 } else { 40 } else {
43 include(assimp.pri) 41 include(assimp.pri)
44diff --git a/tools/tools.pro b/tools/tools.pro 42diff --git a/tools/tools.pro b/tools/tools.pro
45index 121507613..24c49ad5a 100644 43index 3b457ed..9f5376a 100644
46--- a/tools/tools.pro 44--- a/tools/tools.pro
47+++ b/tools/tools.pro 45+++ b/tools/tools.pro
48@@ -1,5 +1,5 @@ 46@@ -1,9 +1,9 @@
49 TEMPLATE = subdirs 47 TEMPLATE = subdirs
48
49-!qtHaveModule(3dcore): \
50+!tools-only:!qtHaveModule(3dcore): \
51 return()
52
50 QT_FOR_CONFIG += 3dcore-private 53 QT_FOR_CONFIG += 3dcore-private
51-qtConfig(assimp):qtConfig(commandlineparser): { 54-qtConfig(assimp):qtConfig(commandlineparser): {
52+tools-only|qtConfig(assimp):qtConfig(commandlineparser): { 55+tools-only|qtConfig(assimp):qtConfig(commandlineparser): {
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index bcc63058..25681f53 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
36 ${S}/src/quick3d/imports/input/importsinput.pro 36 ${S}/src/quick3d/imports/input/importsinput.pro
37} 37}
38 38
39SRCREV = "7da5c4c35a657ea43663b4ed0d65e896b8db5c69" 39SRCREV = "7640c5d526d10e0397e9f2e712139433165d269f"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 1866f3e5..61bd9ea9 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.12" 5QT_MODULE_BRANCH ?= "5.13"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.12.3+git${SRCPV}" 17PV = "5.13.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 516315e5..9f03556a 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -36,7 +36,6 @@ SRC_URI += "\
36 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 36 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
37 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 37 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
38 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 38 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
39 file://0017-Fix-Wdeprecated-copy-warnings.patch \
40" 39"
41 40
42# common for qtbase-native and nativesdk-qtbase 41# common for qtbase-native and nativesdk-qtbase
@@ -142,4 +141,4 @@ do_install() {
142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 141 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
143} 142}
144 143
145SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" 144SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 4d90c772..155dd63c 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 406ea336ac2a1bc7dac055c378303f27b8a20c2d Mon Sep 17 00:00:00 2001 1From 0edb35edfc5ef383e705b50422796dbd5ba8ef1a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -21,17 +21,17 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 21Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
22--- 22---
23 configure | 2 +- 23 configure | 2 +-
24 mkspecs/features/configure.prf | 4 +-- 24 mkspecs/features/configure.prf | 4 ++--
25 mkspecs/features/qt.prf | 6 ++--- 25 mkspecs/features/qt.prf | 6 +++---
26 mkspecs/features/qt_functions.prf | 2 +- 26 mkspecs/features/qt_functions.prf | 2 +-
27 mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ 27 mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++++++++++
28 mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 28 mkspecs/linux-oe-g++/qplatformdefs.h | 1 +
29 6 files changed, 47 insertions(+), 7 deletions(-) 29 6 files changed, 47 insertions(+), 7 deletions(-)
30 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 30 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
32 32
33diff --git a/configure b/configure 33diff --git a/configure b/configure
34index ef7bad1bfc..dcca0f9135 100755 34index ef7bad1..dcca0f9 100755
35--- a/configure 35--- a/configure
36+++ b/configure 36+++ b/configure
37@@ -712,7 +712,7 @@ fi 37@@ -712,7 +712,7 @@ fi
@@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755
44 44
45 # build qmake 45 # build qmake
46diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 46diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
47index 934a18a924..0f5b1b6333 100644 47index 934a18a..0f5b1b6 100644
48--- a/mkspecs/features/configure.prf 48--- a/mkspecs/features/configure.prf
49+++ b/mkspecs/features/configure.prf 49+++ b/mkspecs/features/configure.prf
50@@ -46,14 +46,14 @@ defineTest(qtCompileTest) { 50@@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
@@ -65,19 +65,19 @@ index 934a18a924..0f5b1b6333 100644
65 msg = "test $$1 succeeded" 65 msg = "test $$1 succeeded"
66 write_file($$QMAKE_CONFIG_LOG, msg, append) 66 write_file($$QMAKE_CONFIG_LOG, msg, append)
67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
68index d8d5acaafd..57d11420c2 100644 68index 3a71376..dd6020f 100644
69--- a/mkspecs/features/qt.prf 69--- a/mkspecs/features/qt.prf
70+++ b/mkspecs/features/qt.prf 70+++ b/mkspecs/features/qt.prf
71@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { 71@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) {
72 !isEmpty(plug_type) { 72 plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
73 plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) 73 plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
74 isEmpty(plug_path): \ 74 isEmpty(plug_path): \
75- plug_path = $$[QT_INSTALL_PLUGINS/get] 75- plug_path = $$[QT_INSTALL_PLUGINS/get]
76+ plug_path = $$[QT_INSTALL_PLUGINS] 76+ plug_path = $$[QT_INSTALL_PLUGINS]
77 LIBS += -L$$plug_path/$$plug_type 77 LIBS += $$plug_path/$$plug_type/$$plug_name
78 } 78 } else {
79 LIBS += -l$${plug}$$qtPlatformTargetSuffix() 79 LIBS += -l$${plug}$$qtPlatformTargetSuffix()
80@@ -277,8 +277,8 @@ for(ever) { 80@@ -271,8 +271,8 @@ for(ever) {
81 # static builds: link qml import plugins into the target. 81 # static builds: link qml import plugins into the target.
82 contains(all_qt_module_deps, qml): \ 82 contains(all_qt_module_deps, qml): \
83 qtConfig(static):import_plugins:!host_build:!no_import_scan { 83 qtConfig(static):import_plugins:!host_build:!no_import_scan {
@@ -89,7 +89,7 @@ index d8d5acaafd..57d11420c2 100644
89 # run qmlimportscanner 89 # run qmlimportscanner
90 qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) 90 qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
91diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 91diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
92index 1903e509c8..c093dd4592 100644 92index 1903e50..c093dd4 100644
93--- a/mkspecs/features/qt_functions.prf 93--- a/mkspecs/features/qt_functions.prf
94+++ b/mkspecs/features/qt_functions.prf 94+++ b/mkspecs/features/qt_functions.prf
95@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { 95@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644
103 cmd = perl -w $$system_path($${cmd}.pl) 103 cmd = perl -w $$system_path($${cmd}.pl)
104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
105new file mode 100644 105new file mode 100644
106index 0000000000..c202c47fa1 106index 0000000..c202c47
107--- /dev/null 107--- /dev/null
108+++ b/mkspecs/linux-oe-g++/qmake.conf 108+++ b/mkspecs/linux-oe-g++/qmake.conf
109@@ -0,0 +1,39 @@ 109@@ -0,0 +1,39 @@
@@ -148,7 +148,7 @@ index 0000000000..c202c47fa1
148+load(qt_config) 148+load(qt_config)
149diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 149diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
150new file mode 100644 150new file mode 100644
151index 0000000000..5d22fb4101 151index 0000000..5d22fb4
152--- /dev/null 152--- /dev/null
153+++ b/mkspecs/linux-oe-g++/qplatformdefs.h 153+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
154@@ -0,0 +1 @@ 154@@ -0,0 +1 @@
diff --git a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch
deleted file mode 100644
index a5c4bd32..00000000
--- a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch
+++ /dev/null
@@ -1,371 +0,0 @@
1From 3b92a70c05eebc645d83c5570dac0285f612c039 Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@qt.io>
3Date: Tue, 13 Nov 2018 17:14:43 +0100
4Subject: [PATCH] Fix -Wdeprecated-copy warnings
5
6Implicit copy constructors or methods are considered deprecated for
7classes that has one of the two or a destructor.
8
9The warning is enabled with -Wextra in gcc 9
10
11Change-Id: Ic9be654f2a142fb186a4d5a7d6b4f7d6f4e611d8
12Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13
14Upstream-Status: Backport from 5.13
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 mkspecs/features/qt_common.prf | 19 ++++++-------------
19 src/corelib/io/qprocess_p.h | 3 +--
20 src/corelib/kernel/qvariant.h | 5 ++++-
21 src/corelib/tools/qbytearraylist.h | 2 +-
22 src/corelib/tools/qlist.h | 6 +++++-
23 src/corelib/tools/qstringlist.h | 2 +-
24 src/gui/painting/qtriangulator_p.h | 2 ++
25 src/gui/text/qtextobject.h | 1 +
26 src/widgets/styles/qstyleoption.h | 23 +++++++++++++++++++++++
27 9 files changed, 44 insertions(+), 19 deletions(-)
28
29diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
30index 6cb2e78c1c..1cf2d45168 100644
31--- a/mkspecs/features/qt_common.prf
32+++ b/mkspecs/features/qt_common.prf
33@@ -89,14 +89,8 @@ clang {
34 greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond
35 # GCC 7 has a lot of false positives relating to this, so disable completely
36 greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow
37- # GCC 9 has a lot of false positives relating to this, so disable completely
38- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy
39- # GCC 9 introduced this
40- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move
41- # GCC 9 introduced this
42+ # GCC 9 introduced -Wformat-overflow in -Wall, but it is buggy:
43 greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow
44- # GCC 9 introduced this
45- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime
46 }
47
48 warnings_are_errors:warning_clean {
49@@ -136,14 +130,13 @@ warnings_are_errors:warning_clean {
50
51 # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs.
52 greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=implicit-fallthrough
53- # GCC 9 has a lot of false positives relating to this, so disable completely
54- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy
55+ # GCC 9 introduced -Wdeprecated-copy in -Wextra, but we are not clean for it.
56+ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy
57 # GCC 9 introduced this
58- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move
59+ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=redundant-move
60 # GCC 9 introduced this
61- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow
62- # GCC 9 introduced this
63- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime
64+ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=init-list-lifetime
65+
66 # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135
67 android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
68 }
69diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
70index aa7ecbe91d..eb2d1ed048 100644
71--- a/src/corelib/io/qprocess_p.h
72+++ b/src/corelib/io/qprocess_p.h
73@@ -108,8 +108,7 @@ using QProcEnvKey = QByteArray;
74 class QProcEnvValue
75 {
76 public:
77- QProcEnvValue() {}
78- QProcEnvValue(const QProcEnvValue &other) { *this = other; }
79+ QProcEnvValue() = default;
80 explicit QProcEnvValue(const QString &value) : stringValue(value) {}
81 explicit QProcEnvValue(const QByteArray &value) : byteValue(value) {}
82 bool operator==(const QProcEnvValue &other) const
83diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
84index ff73c27b6e..2394dc58f8 100644
85--- a/src/corelib/kernel/qvariant.h
86+++ b/src/corelib/kernel/qvariant.h
87@@ -396,10 +396,13 @@ class Q_CORE_EXPORT QVariant
88 : type(variantType), is_shared(false), is_null(false)
89 {}
90
91- inline Private(const Private &other) Q_DECL_NOTHROW
92+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
93+ Private(const Private &other) Q_DECL_NOTHROW
94 : data(other.data), type(other.type),
95 is_shared(other.is_shared), is_null(other.is_null)
96 {}
97+ Private &operator=(const Private &other) Q_DECL_NOTHROW = default;
98+#endif
99 union Data
100 {
101 char c;
102diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h
103index ed014dd157..3b5266492f 100644
104--- a/src/corelib/tools/qbytearraylist.h
105+++ b/src/corelib/tools/qbytearraylist.h
106@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods<QByteArray>
107 {
108 #ifndef Q_QDOC
109 protected:
110- ~QListSpecialMethods() {}
111+ ~QListSpecialMethods() = default;
112 #endif
113 public:
114 inline QByteArray join() const
115diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
116index 49ccbc9c9f..1e77b08a15 100644
117--- a/src/corelib/tools/qlist.h
118+++ b/src/corelib/tools/qlist.h
119@@ -72,7 +72,7 @@ template <typename T> class QSet;
120 template <typename T> struct QListSpecialMethods
121 {
122 protected:
123- ~QListSpecialMethods() {}
124+ ~QListSpecialMethods() = default;
125 };
126 template <> struct QListSpecialMethods<QByteArray>;
127 template <> struct QListSpecialMethods<QString>;
128@@ -237,6 +237,8 @@ public:
129 // can't remove it in Qt 5, since doing so would make the type trivial,
130 // which changes the way it's passed to functions by value.
131 inline iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i){}
132+ inline iterator &operator=(const iterator &o) Q_DECL_NOTHROW
133+ { i = o.i; return *this; }
134 #endif
135 inline T &operator*() const { return i->t(); }
136 inline T *operator->() const { return &i->t(); }
137@@ -290,6 +292,8 @@ public:
138 // can't remove it in Qt 5, since doing so would make the type trivial,
139 // which changes the way it's passed to functions by value.
140 inline const_iterator(const const_iterator &o) Q_DECL_NOTHROW : i(o.i) {}
141+ inline const_iterator &operator=(const const_iterator &o) Q_DECL_NOTHROW
142+ { i = o.i; return *this; }
143 #endif
144 #ifdef QT_STRICT_ITERATORS
145 inline explicit const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {}
146diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h
147index 10cbad04d6..693cfe30c4 100644
148--- a/src/corelib/tools/qstringlist.h
149+++ b/src/corelib/tools/qstringlist.h
150@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods<QString>
151 {
152 #ifndef Q_QDOC
153 protected:
154- ~QListSpecialMethods() {}
155+ ~QListSpecialMethods() = default;
156 #endif
157 public:
158 inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive);
159diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h
160index 8f043fc925..c9ae2571f4 100644
161--- a/src/gui/painting/qtriangulator_p.h
162+++ b/src/gui/painting/qtriangulator_p.h
163@@ -93,6 +93,8 @@ public:
164 return indices16.size();
165 }
166
167+ QVertexIndexVector() = default;
168+ QVertexIndexVector(const QVertexIndexVector &other) = default;
169 inline QVertexIndexVector &operator = (const QVertexIndexVector &other)
170 {
171 if (t == UnsignedInt)
172diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
173index 067f8473ea..694eb729d5 100644
174--- a/src/gui/text/qtextobject.h
175+++ b/src/gui/text/qtextobject.h
176@@ -263,6 +263,7 @@ public:
177 iterator() : p(nullptr), b(0), e(0), n(0) {}
178 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
179 iterator(const iterator &o) : p(o.p), b(o.b), e(o.e), n(o.n) {}
180+ iterator &operator=(const iterator &o) = default;
181 #endif
182
183 QTextFragment fragment() const;
184diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h
185index 8ae07efc81..763575ff5b 100644
186--- a/src/widgets/styles/qstyleoption.h
187+++ b/src/widgets/styles/qstyleoption.h
188@@ -118,6 +118,7 @@ public:
189
190 QStyleOptionFocusRect();
191 QStyleOptionFocusRect(const QStyleOptionFocusRect &other) : QStyleOption(Version, Type) { *this = other; }
192+ QStyleOptionFocusRect &operator=(const QStyleOptionFocusRect &other) = default;
193
194 protected:
195 QStyleOptionFocusRect(int version);
196@@ -142,6 +143,7 @@ public:
197
198 QStyleOptionFrame();
199 QStyleOptionFrame(const QStyleOptionFrame &other) : QStyleOption(Version, Type) { *this = other; }
200+ QStyleOptionFrame &operator=(const QStyleOptionFrame &other) = default;
201
202 protected:
203 QStyleOptionFrame(int version);
204@@ -171,6 +173,7 @@ public:
205 QStyleOptionTabWidgetFrame();
206 inline QStyleOptionTabWidgetFrame(const QStyleOptionTabWidgetFrame &other)
207 : QStyleOption(Version, Type) { *this = other; }
208+ QStyleOptionTabWidgetFrame &operator=(const QStyleOptionTabWidgetFrame &other) = default;
209
210 protected:
211 QStyleOptionTabWidgetFrame(int version);
212@@ -194,6 +197,7 @@ public:
213
214 QStyleOptionTabBarBase();
215 QStyleOptionTabBarBase(const QStyleOptionTabBarBase &other) : QStyleOption(Version, Type) { *this = other; }
216+ QStyleOptionTabBarBase &operator=(const QStyleOptionTabBarBase &other) = default;
217
218 protected:
219 QStyleOptionTabBarBase(int version);
220@@ -225,6 +229,7 @@ public:
221
222 QStyleOptionHeader();
223 QStyleOptionHeader(const QStyleOptionHeader &other) : QStyleOption(Version, Type) { *this = other; }
224+ QStyleOptionHeader &operator=(const QStyleOptionHeader &other) = default;
225
226 protected:
227 QStyleOptionHeader(int version);
228@@ -247,6 +252,7 @@ public:
229
230 QStyleOptionButton();
231 QStyleOptionButton(const QStyleOptionButton &other) : QStyleOption(Version, Type) { *this = other; }
232+ QStyleOptionButton &operator=(const QStyleOptionButton &other) = default;
233
234 protected:
235 QStyleOptionButton(int version);
236@@ -284,6 +290,7 @@ public:
237
238 QStyleOptionTab();
239 QStyleOptionTab(const QStyleOptionTab &other) : QStyleOption(Version, Type) { *this = other; }
240+ QStyleOptionTab &operator=(const QStyleOptionTab &other) = default;
241
242 protected:
243 QStyleOptionTab(int version);
244@@ -314,6 +321,7 @@ public:
245 int midLineWidth;
246 QStyleOptionToolBar();
247 QStyleOptionToolBar(const QStyleOptionToolBar &other) : QStyleOption(Version, Type) { *this = other; }
248+ QStyleOptionToolBar &operator=(const QStyleOptionToolBar &other) = default;
249
250 protected:
251 QStyleOptionToolBar(int version);
252@@ -341,6 +349,7 @@ public:
253
254 QStyleOptionProgressBar();
255 QStyleOptionProgressBar(const QStyleOptionProgressBar &other) : QStyleOption(Version, Type) { *this = other; }
256+ QStyleOptionProgressBar &operator=(const QStyleOptionProgressBar &other) = default;
257
258 protected:
259 QStyleOptionProgressBar(int version);
260@@ -371,6 +380,7 @@ public:
261
262 QStyleOptionMenuItem();
263 QStyleOptionMenuItem(const QStyleOptionMenuItem &other) : QStyleOption(Version, Type) { *this = other; }
264+ QStyleOptionMenuItem &operator=(const QStyleOptionMenuItem &other) = default;
265
266 protected:
267 QStyleOptionMenuItem(int version);
268@@ -390,6 +400,7 @@ public:
269
270 QStyleOptionDockWidget();
271 QStyleOptionDockWidget(const QStyleOptionDockWidget &other) : QStyleOption(Version, Type) { *this = other; }
272+ QStyleOptionDockWidget &operator=(const QStyleOptionDockWidget &other) = default;
273
274 protected:
275 QStyleOptionDockWidget(int version);
276@@ -441,6 +452,7 @@ public:
277
278 QStyleOptionViewItem();
279 QStyleOptionViewItem(const QStyleOptionViewItem &other) : QStyleOption(Version, Type) { *this = other; }
280+ QStyleOptionViewItem &operator=(const QStyleOptionViewItem &other) = default;
281
282 protected:
283 QStyleOptionViewItem(int version);
284@@ -471,6 +483,7 @@ public:
285
286 QStyleOptionToolBox();
287 QStyleOptionToolBox(const QStyleOptionToolBox &other) : QStyleOption(Version, Type) { *this = other; }
288+ QStyleOptionToolBox &operator=(const QStyleOptionToolBox &other) = default;
289
290 protected:
291 QStyleOptionToolBox(int version);
292@@ -490,6 +503,7 @@ public:
293
294 QStyleOptionRubberBand();
295 QStyleOptionRubberBand(const QStyleOptionRubberBand &other) : QStyleOption(Version, Type) { *this = other; }
296+ QStyleOptionRubberBand &operator=(const QStyleOptionRubberBand &other) = default;
297
298 protected:
299 QStyleOptionRubberBand(int version);
300@@ -508,6 +522,7 @@ public:
301
302 QStyleOptionComplex(int version = QStyleOptionComplex::Version, int type = SO_Complex);
303 QStyleOptionComplex(const QStyleOptionComplex &other) : QStyleOption(Version, Type) { *this = other; }
304+ QStyleOptionComplex &operator=(const QStyleOptionComplex &other) = default;
305 };
306
307 #if QT_CONFIG(slider)
308@@ -532,6 +547,7 @@ public:
309
310 QStyleOptionSlider();
311 QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; }
312+ QStyleOptionSlider &operator=(const QStyleOptionSlider &other) = default;
313
314 protected:
315 QStyleOptionSlider(int version);
316@@ -551,6 +567,7 @@ public:
317
318 QStyleOptionSpinBox();
319 QStyleOptionSpinBox(const QStyleOptionSpinBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
320+ QStyleOptionSpinBox &operator=(const QStyleOptionSpinBox &other) = default;
321
322 protected:
323 QStyleOptionSpinBox(int version);
324@@ -578,6 +595,7 @@ public:
325
326 QStyleOptionToolButton();
327 QStyleOptionToolButton(const QStyleOptionToolButton &other) : QStyleOptionComplex(Version, Type) { *this = other; }
328+ QStyleOptionToolButton &operator=(const QStyleOptionToolButton &other) = default;
329
330 protected:
331 QStyleOptionToolButton(int version);
332@@ -600,6 +618,7 @@ public:
333
334 QStyleOptionComboBox();
335 QStyleOptionComboBox(const QStyleOptionComboBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
336+ QStyleOptionComboBox &operator=(const QStyleOptionComboBox &other) = default;
337
338 protected:
339 QStyleOptionComboBox(int version);
340@@ -618,6 +637,7 @@ public:
341
342 QStyleOptionTitleBar();
343 QStyleOptionTitleBar(const QStyleOptionTitleBar &other) : QStyleOptionComplex(Version, Type) { *this = other; }
344+ QStyleOptionTitleBar &operator=(const QStyleOptionTitleBar &other) = default;
345
346 protected:
347 QStyleOptionTitleBar(int version);
348@@ -638,6 +658,7 @@ public:
349
350 QStyleOptionGroupBox();
351 QStyleOptionGroupBox(const QStyleOptionGroupBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
352+ QStyleOptionGroupBox &operator=(const QStyleOptionGroupBox &other) = default;
353 protected:
354 QStyleOptionGroupBox(int version);
355 };
356@@ -652,6 +673,7 @@ public:
357
358 QStyleOptionSizeGrip();
359 QStyleOptionSizeGrip(const QStyleOptionSizeGrip &other) : QStyleOptionComplex(Version, Type) { *this = other; }
360+ QStyleOptionSizeGrip &operator=(const QStyleOptionSizeGrip &other) = default;
361 protected:
362 QStyleOptionSizeGrip(int version);
363 };
364@@ -668,6 +690,7 @@ public:
365
366 QStyleOptionGraphicsItem();
367 QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; }
368+ QStyleOptionGraphicsItem &operator=(const QStyleOptionGraphicsItem &other) = default;
369 static qreal levelOfDetailFromTransform(const QTransform &worldTransform);
370 protected:
371 QStyleOptionGraphicsItem(int version);
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index c1f6cfba..b4ccca86 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -32,7 +32,6 @@ SRC_URI += "\
32 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ 32 file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \
33 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ 33 file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \
34 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ 34 file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \
35 file://0017-Fix-Wdeprecated-copy-warnings.patch \
36" 35"
37 36
38# for syncqt 37# for syncqt
@@ -294,4 +293,4 @@ sed -i \
294 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 293 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
295} 294}
296 295
297SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" 296SRCREV = "fc9ae22c88dd085c7c31599037132fc756feeb04"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
deleted file mode 100644
index de5655d3..00000000
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
8 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
9 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
10"
11
12DEPENDS = "qtdeclarative"
13
14SRCREV = "e722ccfe62f2745b2da3b8b1202f8d224c3e5a5f"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index bde9f40e..b289914b 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "dcc4fd4fe0aff770204272d04749184df133bbb2" 11SRCREV = "7c50ad366e8e40996a3b75a31b9834f6f667bde6"
12 12
13# The same issue as in qtbase: 13# The same issue as in qtbase:
14# http://errors.yoctoproject.org/Errors/Details/152641/ 14# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb
new file mode 100644
index 00000000..db0bb8e6
--- /dev/null
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -0,0 +1,14 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
7"
8
9PACKAGECONFIG ?= "qtdeclarative"
10PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
11
12DEPENDS += "qtbase"
13
14SRCREV = "18289e7c1d2778460dccb1135fe283bd234954ad"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 00c161d3..5a93d066 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "9a77336d4984875d95f48b20a521c34f742e0fa7" 22SRCREV = "8f2d6640f959e35a8fd033a50aa57cb13b673cbb"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index e9252f33..78de05b3 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "4672b6d2c725a74d482a76d6624671ae3a2ba2a1" 11SRCREV = "cc7f4769a02421575c9f5a61d9b3687af79201dd"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 41481b4c..9d06377d 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() {
24 rm -rf ${D}${OE_QMAKE_PATH_QML} 24 rm -rf ${D}${OE_QMAKE_PATH_QML}
25} 25}
26 26
27SRCREV = "95c938cd67a1f9ccaf5a3a5fd40993f619786ca9" 27SRCREV = "ecc092fa5519e77a47ef560f0137b4cd5f417c5e"
28 28
29BBCLASSEXTEND =+ "native nativesdk" 29BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 2a142ece..a130c86e 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "48eeb8adf8ccf9eef284b7c6406708bf724f3652" 17SRCREV = "7d610c6b1a437235cba38848c1af9afd5556dc73"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 8ba59471..973a2b7a 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "9c70295220c6dc7f8b4ba8d8406084129e317a6f" 21SRCREV = "417dff666bd5a9e5a09b67780b0ffa8a496cbe92"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 75442663..d1905873 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "5e433bcefaebb8dac20edb96170349f9a0adde5d" 28SRCREV = "a743e1427b4ce9b4f1c43d3456679c09cee7b4e0"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index ead1b19b..5544c62f 100644
--- a/recipes-qt/qt5/qtknx_git.bb
+++ b/recipes-qt/qt5/qtknx_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "0dfc76b080df56ef1638bd6a9deb7325692bc242" 12SRCREV = "4443f12461fc9cab42f4229454a390bd9e1ec4a4"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 6b09db4c..d8caaf2b 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -36,7 +36,7 @@ SRC_URI += " \
36 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 36 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
37" 37"
38 38
39SRCREV_qtlocation = "cbcff2b083df51fb96f38cd64446f4e5afb3b2d1" 39SRCREV_qtlocation = "667af08a388ffc3441adc5b8e73f2f8797b274c5"
40SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" 40SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
41 41
42SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 42SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
new file mode 100644
index 00000000..541ca55f
--- /dev/null
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -0,0 +1,12 @@
1require qt5.inc
2require qt5-git.inc
3
4LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
7 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
8"
9
10DEPENDS += "qtbase qtdeclarative"
11
12SRCREV = "553ec1bc799f344a12e34c91720e13a469d85365"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index d83ce919..af28b74b 100644
--- a/recipes-qt/qt5/qtmqtt_git.bb
+++ b/recipes-qt/qt5/qtmqtt_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "6281dd7e375f94a5e7f78055c0bebba93a2b0e02" 12SRCREV = "72257654cc6f065f64c9218864e1be5f66738e8a"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 30f9c9e4..b24f2a4c 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
37# http://errors.yoctoproject.org/Errors/Build/44914/ 37# http://errors.yoctoproject.org/Errors/Build/44914/
38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 38LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
39 39
40SRCREV = "64981aee3bbbe2c4f5503b458636a84df822b0ec" 40SRCREV = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 849feeb9..a63a29e8 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "5c9251aebb487a6c328f2d706002ca2039aff5ac" 12SRCREV = "8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index a86abbca..b7bdd4ec 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -1,18 +1,21 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial" 4LICENSE = "( GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ 6 file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
7 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 7 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
8 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ 8 file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
9" 9"
10 10
11PACKAGECONFIG ?= "qtdeclarative"
12PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
13
11# src/3rdparty/open62541.pri adds -Wno-format, causing following error 14# src/3rdparty/open62541.pri adds -Wno-format, causing following error
12# because -Wformat-security cannot be used together with -Wno-format 15# because -Wformat-security cannot be used together with -Wno-format
13# cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] 16# cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
14SECURITY_STRINGFORMAT = "" 17SECURITY_STRINGFORMAT = ""
15 18
16DEPENDS += "qtbase qtdeclarative" 19DEPENDS += "qtbase"
17 20
18SRCREV = "56d2b5df55c9a6ea7d21f3412193903f2504249e" 21SRCREV = "3a75d0ac951d9ef165d1f33e9812be9346a6c1f4"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 0750fe68..846e6eda 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtbase qtdeclarative" 11DEPENDS += "qtbase qtdeclarative"
12 12
13SRCREV = "aa924c0575c54c93a5b95ace4083c34f309a16d0" 13SRCREV = "d7b00a49803412caf6a0b415974ff2f4c3adf7f7"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index d41c4b3a..73f9c3d7 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative qtdeclarative-native" 11DEPENDS += "qtdeclarative qtdeclarative-native"
12 12
13SRCREV = "f7ba074ca19f5f3d2d7580616144c65f35b48072" 13SRCREV = "ea80013b2e990c8c28a9dfe7d6afaaa250bf2402"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index d7d9170f..a5228fbd 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 17 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
18" 18"
19 19
20SRCREV = "3a5ac4885b4818489120e9b46c208737ad202fb6" 20SRCREV = "5f7e823d67e615727c8e36aafc6baadfc105c67f"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index d4fd74cc..5e6d6bdc 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
24 24
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
26 26
27SRCREV = "db1e447c46062946e57d7de9c0e0ea5fddc997f6" 27SRCREV = "e7b07a60408285128dedb373316801294ca941b0"
28 28
29BBCLASSEXTEND += "native nativesdk" 29BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index cebd863d..4789cade 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
36# http://errors.yoctoproject.org/Errors/Build/44915/ 36# http://errors.yoctoproject.org/Errors/Build/44915/
37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 37LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
38 38
39SRCREV = "2f6a1056f10dbe634c58725ad2893c6cee58bf1c" 39SRCREV = "9401306e2db3a1756aab958d0939d12c8d5f46e0"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index e71d2828..1b0e51e7 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "755c5a753d77f4c8f53788c870240e60673417a0" 13SRCREV = "cb8388ac1de37ff31786cd1bd4723938b76d0f0a"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
16# 5.12.meta-qt5.2 16# 5.12.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 41c31283..aad757cc 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "b1cb2782b369413add8aeb4c4e6c1453bbf5e367" 15SRCREV = "ce508999540cb125dad40dd250b17e6ad20d542b"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 4b912be4..1d48f5b0 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "64199169df6bd5b1e31d934c0a64c13d57d0f5c4" 14SRCREV = "b18c452fdbe09c54caacb4323dea65b3746485e5"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 1dad6ad1..648460db 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "6fad8e67d879b1979c48ee615a972571a6426718" 15SRCREV = "2f2b747ebc4dd982caede82a0a931ad73e4cd462"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index c167f0a7..e7d8872d 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "a4c2e4de3c8c248a340bef815105371f365a456a" 15SRCREV = "3a4c634241f7271ddfbb840a42d6bf863b46ccea"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index d2b905b6..e33d17d2 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
32 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ 32 ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
33" 33"
34 34
35SRCREV = "1f8d498752fed0b2b92d6a619aa11524dd771998" 35SRCREV = "cc9250477eaa71a3f3ffd050591d4a9d835288ca"
36 36
37BBCLASSEXTEND = "native nativesdk" 37BBCLASSEXTEND = "native nativesdk"
38 38
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 88948a56..bbaee2ef 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ 98 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
99" 99"
100 100
101SRCREV = "8cd09ac290c75eeeb91c015e7d7791b15c0cac5e" 101SRCREV = "88266670663256f40019e7163092e17401557d5f"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 55f39205..21ca0590 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
49 49
50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
51 51
52SRCREV = "c7f9640cb883c05e1ba51dac69078782b7eff855" 52SRCREV = "2413bc23c5f9995752fdd03d56e480d661fc6fbc"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 58ffbe78..cfcfad8e 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "bcdc00bcdc67ee478369c04c994c1f576e51cfab" 40SRCREV = "79037e46eeb00e20c5f3bbe7d0de4b702af86884"
41 41
42BBCLASSEXTEND =+ "native nativesdk" 42BBCLASSEXTEND =+ "native nativesdk"
43 43
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index cc3c867a..b468ecb1 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "5bcd09ac1b670658c77b7712873c75893e4a41a4" 15SRCREV = "fdba7f6e285d35757190d99f9880e3bd0380e254"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
index 8de23c76..d15af51e 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -14,8 +14,9 @@ Upstream-Status: Inappropriate [OE specific]
14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 14Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
15--- 15---
16 src/buildtools/configure_host.pro | 14 +++++++------- 16 src/buildtools/configure_host.pro | 14 +++++++-------
17 src/buildtools/gn.pro | 4 ++--
17 src/core/config/linux.pri | 2 +- 18 src/core/config/linux.pri | 2 +-
18 2 files changed, 8 insertions(+), 8 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
19 20
20diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
21index dd0d3e32..6312c867 100644 22index dd0d3e32..6312c867 100644
@@ -56,11 +57,26 @@ index dd0d3e32..6312c867 100644
56 " ar = \"$$which(ar)\" " \ 57 " ar = \"$$which(ar)\" " \
57 " nm = \"$$which(nm)\" " \ 58 " nm = \"$$which(nm)\" " \
58 " toolchain_args = { " \ 59 " toolchain_args = { " \
60diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
61index b6bf9cf..ae419b1 100644
62--- a/src/buildtools/gn.pro
63+++ b/src/buildtools/gn.pro
64@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
65 gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
66
67 gn_gen_args = --no-last-commit-position --out-path $$out_path \
68- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
69- --ld \"$$which($$QMAKE_LINK)\"
70+ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \
71+ --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\"
72
73 msvc:!clang_cl: gn_gen_args += --use-lto
74
59diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri 75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
60index 9fc8c6e8..f3768585 100644 76index 95b7a4b..db0658e 100644
61--- a/src/core/config/linux.pri 77--- a/src/core/config/linux.pri
62+++ b/src/core/config/linux.pri 78+++ b/src/core/config/linux.pri
63@@ -113,7 +113,7 @@ contains(QT_ARCH, "mips") { 79@@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") {
64 80
65 host_build { 81 host_build {
66 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" 82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
deleted file mode 100644
index 4e901aa9..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From b0e6bada9d4da53204dffa7d9343f925c7d5603e Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration
5
6Force gcc/g++ to be used for parts using host toolchain, since
7the option(host_build) does not work in yocto builds.
8
9Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 gn/build/gen.py | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16diff --git a/gn/build/gen.py b/gn/build/gen.py
17index 87db4c26bcf..34c853b7f4a 100755
18--- a/gn/build/gen.py
19+++ b/gn/build/gen.py
20@@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
21 ld = os.environ.get('LD', 'g++')
22 ar = os.environ.get('AR', 'ar -X64')
23 else:
24- cc = os.environ.get('CC', 'cc')
25- cxx = os.environ.get('CXX', 'c++')
26+ cc = os.environ.get('CC_host', 'gcc')
27+ cxx = os.environ.get('CXX_host', 'g++')
28 ld = cxx
29- ar = os.environ.get('AR', 'ar')
30+ ar = os.environ.get('AR_host', 'ar')
31
32 # QTBUG-64759
33 # cflags = os.environ.get('CFLAGS', '').split()
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
deleted file mode 100644
index 8281dd71..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 53b101c4d3d419920d8a9f96d8afe10716c137c5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 5 Jun 2018 13:58:16 +0000
4Subject: [PATCH] chromium: Fix build with gcc8
5
6---
7 chromium/mojo/public/c/system/buffer.h | 2 +-
8 chromium/mojo/public/c/system/data_pipe.h | 2 +-
9 chromium/mojo/public/c/system/message_pipe.h | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h
13index 2cc54270ad1..917415f8db4 100644
14--- a/chromium/mojo/public/c/system/buffer.h
15+++ b/chromium/mojo/public/c/system/buffer.h
16@@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
17 // See |MojoCreateSharedBufferFlags|.
18 MojoCreateSharedBufferFlags flags;
19 };
20-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
21+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
22 MOJO_STATIC_ASSERT(sizeof(MojoCreateSharedBufferOptions) == 8,
23 "MojoCreateSharedBufferOptions has wrong size");
24
25diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h
26index 3702cdb6249..a86c8e8b321 100644
27--- a/chromium/mojo/public/c/system/data_pipe.h
28+++ b/chromium/mojo/public/c/system/data_pipe.h
29@@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
30 // system-dependent capacity of at least one element in size.
31 uint32_t capacity_num_bytes;
32 };
33-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
34+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
35 MOJO_STATIC_ASSERT(sizeof(MojoCreateDataPipeOptions) == 16,
36 "MojoCreateDataPipeOptions has wrong size");
37
38diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h
39index 9f222f9aa81..4878774707a 100644
40--- a/chromium/mojo/public/c/system/message_pipe.h
41+++ b/chromium/mojo/public/c/system/message_pipe.h
42@@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
43 // See |MojoCreateMessagePipeFlags|.
44 MojoCreateMessagePipeFlags flags;
45 };
46-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
47+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
48 MOJO_STATIC_ASSERT(sizeof(MojoCreateMessagePipeOptions) == 8,
49 "MojoCreateMessagePipeOptions has wrong size");
50
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
index 3305c6b4..7823482b 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
@@ -6,15 +6,15 @@ Subject: [PATCH] chromium: fix build with clang
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8--- 8---
9 chromium/build/config/compiler/BUILD.gn | 27 ++----------------------- 9 chromium/build/config/compiler/BUILD.gn | 27 ++-------------------------
10 1 file changed, 2 insertions(+), 25 deletions(-) 10 1 file changed, 2 insertions(+), 25 deletions(-)
11 11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index d223a4f6fd4..1c42c49ea4a 100644 13index d223a4f6fd4..1c42c49ea4a 100644
14--- a/chromium/build/config/compiler/BUILD.gn 14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn 15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -544,13 +544,6 @@ config("compiler") { 16@@ -561,13 +561,6 @@ config("compiler") {
17 ] 17 }
18 } 18 }
19 19
20- # Tells the compiler not to use absolute paths when passing the default 20- # Tells the compiler not to use absolute paths when passing the default
@@ -27,7 +27,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
27 # C11/C++11 compiler flags setup. 27 # C11/C++11 compiler flags setup.
28 # --------------------------- 28 # ---------------------------
29 if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { 29 if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
30@@ -748,8 +741,6 @@ config("compiler_cpu_abi") { 30@@ -799,8 +792,6 @@ config("compiler_cpu_abi") {
31 } 31 }
32 } else if (current_cpu == "arm") { 32 } else if (current_cpu == "arm") {
33 if (is_clang && !is_android && !is_nacl) { 33 if (is_clang && !is_android && !is_nacl) {
@@ -36,7 +36,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
36 } 36 }
37 if (!is_nacl) { 37 if (!is_nacl) {
38 cflags += [ 38 cflags += [
39@@ -762,8 +753,6 @@ config("compiler_cpu_abi") { 39@@ -813,8 +804,6 @@ config("compiler_cpu_abi") {
40 } 40 }
41 } else if (current_cpu == "arm64") { 41 } else if (current_cpu == "arm64") {
42 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 42 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -45,7 +45,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
45 } 45 }
46 } else if (current_cpu == "mipsel" && !is_nacl) { 46 } else if (current_cpu == "mipsel" && !is_nacl) {
47 ldflags += [ "-Wl,--hash-style=sysv" ] 47 ldflags += [ "-Wl,--hash-style=sysv" ]
48@@ -772,9 +761,6 @@ config("compiler_cpu_abi") { 48@@ -823,9 +812,6 @@ config("compiler_cpu_abi") {
49 if (is_android) { 49 if (is_android) {
50 cflags += [ "--target=mipsel-linux-android" ] 50 cflags += [ "--target=mipsel-linux-android" ]
51 ldflags += [ "--target=mipsel-linux-android" ] 51 ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +55,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
55 } 55 }
56 } else { 56 } else {
57 cflags += [ "-EL" ] 57 cflags += [ "-EL" ]
58@@ -853,10 +839,7 @@ config("compiler_cpu_abi") { 58@@ -904,10 +890,7 @@ config("compiler_cpu_abi") {
59 } else if (current_cpu == "mips" && !is_nacl) { 59 } else if (current_cpu == "mips" && !is_nacl) {
60 ldflags += [ "-Wl,--hash-style=sysv" ] 60 ldflags += [ "-Wl,--hash-style=sysv" ]
61 if (custom_toolchain == "") { 61 if (custom_toolchain == "") {
@@ -67,7 +67,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
67 cflags += [ "-EB" ] 67 cflags += [ "-EB" ]
68 ldflags += [ "-EB" ] 68 ldflags += [ "-EB" ]
69 } 69 }
70@@ -902,9 +885,6 @@ config("compiler_cpu_abi") { 70@@ -954,9 +937,6 @@ config("compiler_cpu_abi") {
71 if (is_android) { 71 if (is_android) {
72 cflags += [ "--target=mips64el-linux-android" ] 72 cflags += [ "--target=mips64el-linux-android" ]
73 ldflags += [ "--target=mips64el-linux-android" ] 73 ldflags += [ "--target=mips64el-linux-android" ]
@@ -77,7 +77,7 @@ index d223a4f6fd4..1c42c49ea4a 100644
77 } 77 }
78 } else { 78 } else {
79 cflags += [ 79 cflags += [
80@@ -961,10 +941,7 @@ config("compiler_cpu_abi") { 80@@ -1013,10 +993,7 @@ config("compiler_cpu_abi") {
81 } else if (current_cpu == "mips64") { 81 } else if (current_cpu == "mips64") {
82 ldflags += [ "-Wl,--hash-style=sysv" ] 82 ldflags += [ "-Wl,--hash-style=sysv" ]
83 if (custom_toolchain == "") { 83 if (custom_toolchain == "") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
deleted file mode 100644
index 5988ec7f..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 4e99677795977faccd1f28ac8fb8b3cfd72c4dcd Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 22:09:20 -0800
4Subject: [PATCH] chromium: Check for __ARM_FP & 2 before using __fp16
5
6The __fp16 type denotes half-precision (16-bit) floating-point.
7The recommended way to test for this hardware support is to test bit 1 in __ARM_FP
8and
9If 16-bit floating-point is available, one of __ARM_FP16_FORMAT_IEEE and
10__ARM_FP16_FORMAT_ALTERNATIVE will be defined to indicate the format in use
11
12Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
19index 33d9e7aa39f..aaefa5371ae 100644
20--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
21+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
22@@ -679,7 +679,7 @@ SI F from_half(U16 h) {
23 }
24
25 SI U16 to_half(F f) {
26-#if defined(__ARM_FP16_FORMAT_IEEE)
27+#if defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2)
28 __fp16 fp16 = __fp16(f);
29 U16 u16;
30 memcpy(&u16, &fp16, sizeof(U16));
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
index 377795f8..9a080207 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -18,12 +18,12 @@ diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUIL
18index 05907b481ac..dbc4be143cd 100644 18index 05907b481ac..dbc4be143cd 100644
19--- a/chromium/third_party/zlib/BUILD.gn 19--- a/chromium/third_party/zlib/BUILD.gn
20+++ b/chromium/third_party/zlib/BUILD.gn 20+++ b/chromium/third_party/zlib/BUILD.gn
21@@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") { 21@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) {
22 # - ChromeOS has wrapper scripts that are borking the compiler flags. 22 # implement the CRC32* instructions. These are optional in ARMv8.0."
23 # - Fuchsia just added a syscall for feature detection. 23 # - Fuchsia just added a syscall for feature detection.
24 # TODO(cavalcantii): crbug.com/810125. 24 # TODO(cavalcantii): crbug.com/810125.
25+ defines = [] 25+ defines = []
26 if (!is_ios && !is_chromeos && !is_fuchsia) { 26 if (is_clang && (!is_ios && !is_fuchsia)) {
27- defines = [ "CRC32_ARMV8_CRC32" ] 27- defines = [ "CRC32_ARMV8_CRC32" ]
28+ if (current_cpu == "arm64") { 28+ if (current_cpu == "arm64") {
29+ defines += [ "CRC32_ARMV8_CRC32" ] 29+ defines += [ "CRC32_ARMV8_CRC32" ]
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 84fcfbfb..a281cba2 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -132,7 +132,7 @@ RDEPENDS_${PN}-examples += " \
132 qtdeclarative-qmlplugins \ 132 qtdeclarative-qmlplugins \
133" 133"
134 134
135QT_MODULE_BRANCH_CHROMIUM = "69-based" 135QT_MODULE_BRANCH_CHROMIUM = "73-based"
136 136
137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 137# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12
138# 5.12.meta-qt5.4 138# 5.12.meta-qt5.4
@@ -148,12 +148,9 @@ SRC_URI_append_libc-musl = "\
148# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based 148# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based
149# 69-based.meta-qt5.4 149# 69-based.meta-qt5.4
150SRC_URI += " \ 150SRC_URI += " \
151 file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
152 file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ 151 file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
153 file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \
154 file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ 152 file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \
155 file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ 153 file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \
156 file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \
157 file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ 154 file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \
158 file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ 155 file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \
159" 156"
@@ -175,8 +172,8 @@ SRC_URI_append_libc-musl = "\
175 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 172 file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
176" 173"
177 174
178SRCREV_qtwebengine = "c7b8d6d87809253241913c595902a11ea506b2b7" 175SRCREV_qtwebengine = "5d4bac57a0191287a2fc345f6b398fb1f5d08517"
179SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990" 176SRCREV_chromium = "8a28c0bb19fc8627812cb7c3154408b71ff2bf5e"
180SRCREV = "${SRCREV_qtwebengine}" 177SRCREV = "${SRCREV_qtwebengine}"
181 178
182SRCREV_FORMAT = "qtwebengine_chromium" 179SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index 01538d0d..b5760229 100644
--- a/recipes-qt/qt5/qtwebglplugin_git.bb
+++ b/recipes-qt/qt5/qtwebglplugin_git.bb
@@ -18,4 +18,4 @@ do_configure_prepend() {
18 18
19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 19EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
20 20
21SRCREV = "9007ba49d14ef56e56a2114685ddd5b23e25f5c8" 21SRCREV = "15637e6d824bca5d149147207a98cbc016fbbef6"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 59f5cd85..11144537 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "0f1373617f2d1c562fd448fee207f7d99a0191bc" 14SRCREV = "b7d892b97697f90b3669dab56358a48fb3542f68"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 60733298..dc2a3e4b 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "3ae7d8eac3a46b5a70d71c556703ce2f21c169dc" 22SRCREV = "3265fa961a27894faa5b3413fb39c8682266a72f"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index aca99236..31c5b671 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "b5c05ebc46fde8e98e388cd5bf86795b040da505" 15SRCREV = "7e86e23ee87f2450b3f7103632c3ad2ab082e5eb"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 103648eb..73631fcd 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,7 +25,7 @@ do_configure_prepend() {
25 25
26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" 26EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
27 27
28SRCREV = "f969bdea083012282806ae83a38ace53ef1ba600" 28SRCREV = "29891df4ce099542635e33891945ba19f3e9572c"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"
31 31
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-22 23:12:21 +0000