summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-08 14:10:13 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-01-11 14:03:48 +0100
commitca649e3f6f03c5351a090852ff93a23e7382c86a (patch)
tree3273897abf1ea0991a78ae884f967b2c88fa9811 /recipes-qt/qt5
parentede15adc71f7f1c2acd63e96777b5d02d052a681 (diff)
downloadmeta-qt5-ca649e3f6f03c5351a090852ff93a23e7382c86a.tar.gz
qt5: Update to Qt 5.14.0
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb4
-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.bb6
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch13
-rw-r--r--recipes-qt/qt5/qtbase_git.bb4
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtcoap_git.bb2
-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.bb4
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-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.bb2
-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/run-ptest4
-rw-r--r--recipes-qt/qt5/qttools_git.bb3
-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.patch32
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch24
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch40
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch12
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch16
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb6
-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
55 files changed, 133 insertions, 155 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 1b18f7c2..165aa562 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ 13 file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \
14" 14"
15 15
16QT_MODULE = "qtbase" 16QT_MODULE = "qtbase"
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() {
195do_generate_qt_environment_file[umask] = "022" 195do_generate_qt_environment_file[umask] = "022"
196addtask generate_qt_environment_file after do_install before do_package 196addtask generate_qt_environment_file after do_install before do_package
197 197
198SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" 198SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index ea8e3266..cbdbeae7 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 = "93361f1a59c1edd2e4eb6d2aa7e2da5b73760a18" 39SRCREV = "96b1b9e3e198e751bb96eeb279106862ca38e7d7"
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 09d00f31..80bfb987 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.13" 5QT_MODULE_BRANCH ?= "5.14"
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.13.2+git${SRCPV}" 17PV = "5.14.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 083e5306..154740ee 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 12 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
13 file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ 13 file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \
14" 14"
15 15
16require qt5-native.inc 16require qt5-native.inc
@@ -137,11 +137,9 @@ do_install() {
137 done 137 done
138 fi 138 fi
139 139
140 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
141
142 # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++") 140 # since 5.9.2 something sets a very strange path to mkspec ("${_qt5Core_install_prefix}/../../../../../../../../../../usr/lib/qt5//mkspecs/linux-oe-g++")
143 # override this until somebody finds a better way 141 # override this until somebody finds a better way
144 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
145} 143}
146 144
147SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" 145SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index b08ab11f..6157a52c 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -18,7 +18,7 @@ diff --git a/configure.pri b/configure.pri
18index 3778ece180..94bdfd2649 100644 18index 3778ece180..94bdfd2649 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -851,10 +851,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) {
22 22
23 $${currentConfig}.output.qconfigSource = \ 23 $${currentConfig}.output.qconfigSource = \
24 "/* Installation Info */" \ 24 "/* Installation Info */" \
diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
index 00db5344..d5c23c38 100644
--- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
+++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch
@@ -7,13 +7,13 @@ musl does not have feenableexcept function
7 7
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- 9---
10 tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +- 10 tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 13diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
14index be2e2a2e08..68aa8369a5 100644 14index 676c66d..ba05aad 100644
15--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 15--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
16+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp 16+++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
17@@ -46,7 +46,7 @@ 17@@ -46,7 +46,7 @@
18 #include <private/qlocale_tools_p.h> 18 #include <private/qlocale_tools_p.h>
19 #include <qnumeric.h> 19 #include <qnumeric.h>
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
index e8d35776..1f1ec8bd 100644
--- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
+++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch
@@ -25,15 +25,15 @@ diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
25index df210fe42d..79a3ddf2f8 100644 25index df210fe42d..79a3ddf2f8 100644
26--- a/mkspecs/common/clang.conf 26--- a/mkspecs/common/clang.conf
27+++ b/mkspecs/common/clang.conf 27+++ b/mkspecs/common/clang.conf
28@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX 28@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch
29 CONFIG += clang_pch_style 29
30 QMAKE_PCH_OUTPUT_EXT = .pch 30 QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
31 31
32-QMAKE_CFLAGS_ISYSTEM = -isystem 32-QMAKE_CFLAGS_ISYSTEM = -isystem
33+QMAKE_CFLAGS_ISYSTEM = 33+QMAKE_CFLAGS_ISYSTEM =
34 QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} 34 QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} 35 QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
36 QMAKE_CFLAGS_LTCG = -flto 36 QMAKE_CFLAGS_LTCG = -flto=thin
37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf 37diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
38index 44b4267207..9756a02014 100644 38index 44b4267207..9756a02014 100644
39--- a/mkspecs/common/gcc-base.conf 39--- a/mkspecs/common/gcc-base.conf
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 b56224b9..34e41a18 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
@@ -22,7 +22,7 @@ index a94f6d0eeb..ccab725843 100644
22 static:no-static-ltcg { 22 static:no-static-ltcg {
23 # Static library but no-static-ltcg enabled: skip LTCG 23 # Static library but no-static-ltcg enabled: skip LTCG
24-} else: CONFIG(release, debug|release) { 24-} else: CONFIG(release, debug|release) {
25+} else: CONFIG(release, debug|release)!host_build { 25+} else: CONFIG(release, debug|release):!host_build {
26 # We need fat object files when creating static libraries on some platforms 26 separate_debug_info {
27 # so the linker will know to load a particular object from the library 27 # Evaluate single-$ variable references that have no valid value at mkspec loading time
28 # in the first place. On others, we have special ar and nm to create the symbol 28 QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO ~= s/\\$\\{/\$\$\{/
diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
index 4832464f..c027fb68 100644
--- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
+++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch
@@ -29,8 +29,8 @@ index 3555763..e7dc57c 100644
29 QT_BEGIN_NAMESPACE 29 QT_BEGIN_NAMESPACE
30 30
31 Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") 31 Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
32@@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(in 32@@ -150,7 +155,10 @@
33 qCDebug(qLcEvdevKey) << "switchLed" << led << state; 33 qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
34 34
35 struct ::input_event led_ie; 35 struct ::input_event led_ie;
36- ::gettimeofday(&led_ie.time, 0); 36- ::gettimeofday(&led_ie.time, 0);
@@ -45,7 +45,7 @@ diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/p
45index 78728ef..1d65f9b 100644 45index 78728ef..1d65f9b 100644
46--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp 46--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
47+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp 47+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
48@@ -55,6 +55,11 @@ 48@@ -58,6 +58,11 @@
49 #include <linux/input.h> 49 #include <linux/input.h>
50 #endif 50 #endif
51 51
@@ -57,7 +57,7 @@ index 78728ef..1d65f9b 100644
57 #include <math.h> 57 #include <math.h>
58 58
59 #if QT_CONFIG(mtdev) 59 #if QT_CONFIG(mtdev)
60@@ -568,7 +573,7 @@ void QEvdevTouchScreenData::processInput 60@@ -573,7 +578,7 @@
61 61
62 // update timestamps 62 // update timestamps
63 m_lastTimeStamp = m_timeStamp; 63 m_lastTimeStamp = m_timeStamp;
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
index 6d480105..2393673f 100644
--- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
+++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch
@@ -27,7 +27,7 @@ diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qcon
27index 10458e41d7..8cfa40e461 100644 27index 10458e41d7..8cfa40e461 100644
28--- a/src/corelib/global/qconfig-bootstrapped.h 28--- a/src/corelib/global/qconfig-bootstrapped.h
29+++ b/src/corelib/global/qconfig-bootstrapped.h 29+++ b/src/corelib/global/qconfig-bootstrapped.h
30@@ -100,14 +100,14 @@ 30@@ -104,7 +104,7 @@
31 #define QT_FEATURE_process -1 31 #define QT_FEATURE_process -1
32 #define QT_FEATURE_regularexpression -1 32 #define QT_FEATURE_regularexpression -1
33 #ifdef __GLIBC_PREREQ 33 #ifdef __GLIBC_PREREQ
@@ -36,7 +36,8 @@ index 10458e41d7..8cfa40e461 100644
36 #else 36 #else
37 # define QT_FEATURE_renameat2 -1 37 # define QT_FEATURE_renameat2 -1
38 #endif 38 #endif
39 #define QT_FEATURE_sharedmemory -1 39@@ -112,7 +112,7 @@
40 #define QT_FEATURE_signaling_nan -1
40 #define QT_FEATURE_slog2 -1 41 #define QT_FEATURE_slog2 -1
41 #ifdef __GLIBC_PREREQ 42 #ifdef __GLIBC_PREREQ
42-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) 43-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
@@ -45,12 +46,12 @@ index 10458e41d7..8cfa40e461 100644
45 # define QT_FEATURE_statx -1 46 # define QT_FEATURE_statx -1
46 #endif 47 #endif
47diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp 48diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
48index b78e037865..9574d1a044 100644 49index c3abec8..6229c61 100644
49--- a/src/corelib/io/qfilesystemengine_unix.cpp 50--- a/src/corelib/io/qfilesystemengine_unix.cpp
50+++ b/src/corelib/io/qfilesystemengine_unix.cpp 51+++ b/src/corelib/io/qfilesystemengine_unix.cpp
51@@ -1232,16 +1232,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy 52@@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
52 if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) 53 Q_CHECK_FILE_NAME(srcPath, false);
53 return emptyFileEntryWarning(), false; 54 Q_CHECK_FILE_NAME(tgtPath, false);
54 55
55-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) 56-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2)
56- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) 57- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0)
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index f4f0919c..5f6e2e65 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 11 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
12 file://LICENSE.QT-LICENSE-AGREEMENT-4.0;md5=948f8877345cd66106f11031977a4625 \ 12 file://LICENSE.QT-LICENSE-AGREEMENT;md5=994e4301576163cfe0bc3f4f5462bf09 \
13" 13"
14 14
15# common for qtbase-native, qtbase-nativesdk and qtbase 15# common for qtbase-native, qtbase-nativesdk and qtbase
@@ -296,4 +296,4 @@ sed -i \
296 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 296 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
297} 297}
298 298
299SRCREV = "a7a24784eeba6747d319eb911583bdd99ef38cdb" 299SRCREV = "2a887a517eaaa2c5324aecf3b919899b7a86ff4a"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 9b837f08..afc3da92 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 = "f047b1a9bb73d4b6df24729435e4156dfb84e90e" 11SRCREV = "8ea7ee70c994bcb3e1b20a9e839d26420be082cb"
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
index a32bcefb..e8e272f3 100644
--- a/recipes-qt/qt5/qtcoap_git.bb
+++ b/recipes-qt/qt5/qtcoap_git.bb
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
11 11
12DEPENDS += "qtbase" 12DEPENDS += "qtbase"
13 13
14SRCREV = "bc4dca032f385658898db017af110f4d8e29816d" 14SRCREV = "1d2ba407d26c6c7005e38fe9cec6d0a0ce405309"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 70921fc3..ba97d470 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 = "13b15ab1b1ee2ad56d0d37b07d694fbfc22e97a3" 22SRCREV = "1c92d490766f2ac93bf51771f913fdfe708da188"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index d55adc3e..7bd62837 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 = "af4466c7af7345a2a92f2523b29e79ce22205003" 11SRCREV = "882075ef10d585c0e5779443a5bde8836b25762d"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 47833942..8a0a1ec3 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -28,6 +28,6 @@ do_install_append_class-nativesdk() {
28 rm -rf ${D}${OE_QMAKE_PATH_QML} 28 rm -rf ${D}${OE_QMAKE_PATH_QML}
29} 29}
30 30
31SRCREV = "4080025fed9d43a78b578bcab67397712459d28c" 31SRCREV = "290251541e615358dcc7a289ff2adb30f309c132"
32 32
33BBCLASSEXTEND =+ "native nativesdk" 33BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 90411c44..101169b3 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 = "2d5c3c24925bf96f48789fbc0e1b78371ba1170e" 17SRCREV = "8bef70f170bf9803f77971f553ebdc9aac5a3aa6"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 0c733970..e51f3526 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 = "b38eddb4a5aff6dc408b99124ef3c43d80ee88cb" 21SRCREV = "84c446d72349fc99ccad7b738b1a79c4ec36335d"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index bdf6340a..d70ba9de 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 = "9fe1f2e918d39031852805f1add23125c061d3c3" 28SRCREV = "bcced9cb1baefe3507338a602fe95be915798661"
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb
index c85287d0..3185f5c2 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 = "6cdc937d5cbfc4ca6b0520c27d0747a66ccb1879" 12SRCREV = "9350fc875a0722e7d05d44f0d53e6aa92122b79c"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index d0969b12..7ed00674 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 = "b8cc5f3ae51cec793f1a962db88e3c251c983298" 39SRCREV_qtlocation = "dec8f4c7680b47c1386b69829fc1ae7c38e4186f"
40SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" 40SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
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
index 9f5d51cc..de16d674 100644
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative" 10DEPENDS += "qtbase qtdeclarative"
11 11
12SRCREV = "2c681d20c0afd203876bfd733b559eb021aa7cdf" 12SRCREV = "6e1be78c12be9857c6c35bdd6e89331e41708b22"
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb
index 4d690964..ddff2949 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 = "4b3201059dfc2fc5038910c51eb8ca9d75e98765" 12SRCREV = "37ead173bfabc8b930a2a0571ad03a15e86cf7bb"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 11b53496..96331422 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 = "dce51b45e8d50ad37fea3debb51a84d62e944b5d" 40SRCREV = "d9f2a814eb5d8c2c0e985f60b345fefd956e2bb0"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 309e8189..f3232631 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 = "ee0ce46332d364e76e9ec2b0adf7e5cbda504863" 12SRCREV = "abda4bd8ba187aac78052e30b286215b1746783a"
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb
index 9f72c1bf..277bdc9a 100644
--- a/recipes-qt/qt5/qtopcua_git.bb
+++ b/recipes-qt/qt5/qtopcua_git.bb
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
18 18
19DEPENDS += "qtbase" 19DEPENDS += "qtbase"
20 20
21SRCREV = "b4588093a5a32d12700afa9e0f0ff54df57ffd66" 21SRCREV = "5b3ad68a3a0a6cc9670dc86c3d906ec72181253b"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index 4505837e..a6ecad96 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 = "cc094b80bffd972a1dc071e745888b213dde44f5" 13SRCREV = "ecb890f14ea3b81a97aaca05b6af2508bd6f68a4"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 75ad8b56..f552ef2b 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 = "c0fb745acdbed0828e3b66f6a6705203a2754591" 13SRCREV = "0d2fc12b65028b4f04bdace3991448813130ab48"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 16afde6a..cf80a83e 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 = "9a5e84b8f9ca0eeda8170eb93c093f3ab25de988" 20SRCREV = "d88b285166d7963faca84ce8484984a74904f58a"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 8f15b1fe..33b7ed3a 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
25 25
26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 26EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
27 27
28SRCREV = "44d51ea7b45b2dce1b6772217269a4d1dff88a80" 28SRCREV = "2f00e14a46292afbf036e196aa72dc2f1639bf50"
29 29
30BBCLASSEXTEND += "native nativesdk" 30BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 0101da83..d1b3dce1 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 = "18bade63bdcd1d8fcba013f788e114774efa0e4f" 39SRCREV = "286286f9750a6417b00877c84cf73fc61002c139"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index cdad9d76..e7f58c13 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 = "575d92175aec3d6bd84872a9ad00adf924b6993d" 13SRCREV = "5e4882514dc9c5da9b8f268580078d57d50cbce9"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.13
16# 5.13.meta-qt5.1 16# 5.13.meta-qt5.1
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 59cfe0b4..b8173c41 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 = "e032fe21b6d8d2c92e93ab0ba7a367be23db82b8" 15SRCREV = "615ae0abc1f2b9baf54f196bb5197c25a90304a3"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 07032cdb..3f2b71f4 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 = "9c498a990646f6d51b461a246b7cce477423721a" 14SRCREV = "08f5114d3943d2b4974384a3e1419690fb3882ab"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 886b8a63..0df2283f 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 = "2216279ffd43fb84042da2faa5bc432770351ec3" 15SRCREV = "a7e3c9b9538bb87755f2765d2ab4926b2c854066"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index cd59f8f8..9d0696dc 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 = "582bbf973f608e8a3b9d5e3b8318eb995930e4a0" 15SRCREV = "90e901077aabaab30b585a3e5d6e6e9c93fa6352"
diff --git a/recipes-qt/qt5/qttools/run-ptest b/recipes-qt/qt5/qttools/run-ptest
deleted file mode 100644
index 5cd5e27e..00000000
--- a/recipes-qt/qt5/qttools/run-ptest
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2
3./tst_qtdiag
4./tst_qtattributionsscanner
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index e9352e5b..3f22a6e8 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,6 +1,5 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3require qt5-ptest.inc
4 3
5HOMEPAGE = "http://www.qt.io" 4HOMEPAGE = "http://www.qt.io"
6LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 5LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
@@ -50,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
50 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ 49 ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
51" 50"
52 51
53SRCREV = "78f52a4027da110bf14468b575c7262b4d28d65e" 52SRCREV = "1682033b1bdadefeb9b953f7d9d096d884f797e2"
54 53
55BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
56 55
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index f36cacf6..f5c5f1ed 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 = "36022c8e9263c1940710cd214965979e9bd8a036" 101SRCREV = "fbdeaab046d623f3238fbf0da9c8bdb0009c01a9"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index a6782f46..54c4d5d0 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
71 71
72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" 72DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
73 73
74SRCREV = "8fc2c34c670fb9bc9ed2393b2d2e1592a74dbfb0" 74SRCREV = "459ec87b0abdd476d415946ed07c8490c10b97f0"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 7cfbcaa1..ce697dba 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
39 39
40EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 40EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
41 41
42SRCREV = "615aa208d131ab99e967725504fcb16fdda4ea83" 42SRCREV = "4e015b3383a218b31cae4437cd30076fb031f3ad"
43 43
44BBCLASSEXTEND =+ "native nativesdk" 44BBCLASSEXTEND =+ "native nativesdk"
45 45
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 34d4250b..db8a6a92 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 = "3be3e5756f867b34f29f18cbda9b0c2807017a71" 15SRCREV = "e93a22de5465d76d139954c3dd059ed3041ea6b9"
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 169ed078..7bda76a2 100644
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
@@ -13,13 +13,26 @@ for the qmakes's host architecture.
13Upstream-Status: Inappropriate [OE specific] 13Upstream-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/config/linux.pri | 2 +-
16 src/buildtools/configure_host.pro | 14 +++++++------- 17 src/buildtools/configure_host.pro | 14 +++++++-------
17 src/buildtools/gn.pro | 4 ++-- 18 src/buildtools/gn.pro | 4 ++--
18 src/core/config/linux.pri | 2 +-
19 3 files changed, 10 insertions(+), 10 deletions(-) 19 3 files changed, 10 insertions(+), 10 deletions(-)
20 20
21diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
22index 998aedc..b04db36 100644
23--- a/src/buildtools/config/linux.pri
24+++ b/src/buildtools/config/linux.pri
25@@ -124,7 +124,7 @@ contains(QT_ARCH, "mips") {
26
27 host_build {
28 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
29- GN_HOST_CPU = $$gnArch($$QT_ARCH)
30+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
31 gn_args += host_cpu=\"$$GN_HOST_CPU\"
32 # Don't bother trying to use system libraries in this case
33 gn_args += use_glib=false
21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 34diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
22index dd0d3e32..6312c867 100644 35index dd0d3e3..6312c86 100644
23--- a/src/buildtools/configure_host.pro 36--- a/src/buildtools/configure_host.pro
24+++ b/src/buildtools/configure_host.pro 37+++ b/src/buildtools/configure_host.pro
25@@ -4,7 +4,7 @@ TEMPLATE = aux 38@@ -4,7 +4,7 @@ TEMPLATE = aux
@@ -58,7 +71,7 @@ index dd0d3e32..6312c867 100644
58 " nm = \"$$which(nm)\" " \ 71 " nm = \"$$which(nm)\" " \
59 " toolchain_args = { " \ 72 " toolchain_args = { " \
60diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro 73diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
61index b6bf9cfc..ae419b1a 100644 74index 033202e..a8ca656 100644
62--- a/src/buildtools/gn.pro 75--- a/src/buildtools/gn.pro
63+++ b/src/buildtools/gn.pro 76+++ b/src/buildtools/gn.pro
64@@ -19,8 +19,8 @@ build_pass|!debug_and_release { 77@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
@@ -72,16 +85,3 @@ index b6bf9cfc..ae419b1a 100644
72 85
73 msvc:!clang_cl: gn_gen_args += --use-lto 86 msvc:!clang_cl: gn_gen_args += --use-lto
74 87
75diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
76index f45c418f..df8ac00b 100644
77--- a/src/core/config/linux.pri
78+++ b/src/core/config/linux.pri
79@@ -123,7 +123,7 @@ contains(QT_ARCH, "mips") {
80
81 host_build {
82 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
83- GN_HOST_CPU = $$gnArch($$QT_ARCH)
84+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
85 gn_args += host_cpu=\"$$GN_HOST_CPU\"
86 # Don't bother trying to use system libraries in this case
87 gn_args += use_glib=false
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
index 1c975aed..ed7f78f6 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-stack-pointer-clobber.patch
@@ -13,22 +13,13 @@ of flagging this silent ignoring via [1]
13Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160] 13Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/linux-syscall-support/+/1390160]
14Signed-off-by: Khem Raj <raj.khem@gmail.com> 14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15--- 15---
16 chromium/third_party/lss/linux_syscall_support.h | 10 +++++----- 16 chromium/third_party/lss/linux_syscall_support.h | 6 +++---
17 1 file changed, 5 insertions(+), 5 deletions(-) 17 1 file changed, 3 insertions(+), 3 deletions(-)
18 18
19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h 19diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
20index 5d9c2e8582f..e19e51dd304 100644 20index 9276f56..622cc1f 100644
21--- a/chromium/third_party/lss/linux_syscall_support.h 21--- a/chromium/third_party/lss/linux_syscall_support.h
22+++ b/chromium/third_party/lss/linux_syscall_support.h 22+++ b/chromium/third_party/lss/linux_syscall_support.h
23@@ -1964,7 +1964,7 @@ struct kernel_statfs {
24 __asm__ volatile(LSS_ENTRYPOINT \
25 : "=a" (__res) \
26 : "0" (__NR_##name) \
27- : "esp", "memory"); \
28+ : "memory"); \
29 LSS_RETURN(type,__res); \
30 }
31 #undef _syscall1
32@@ -2012,7 +2012,7 @@ struct kernel_statfs { 23@@ -2012,7 +2012,7 @@ struct kernel_statfs {
33 : "i" (__NR_##name), "ri" ((long)(arg1)), \ 24 : "i" (__NR_##name), "ri" ((long)(arg1)), \
34 "c" ((long)(arg2)), "d" ((long)(arg3)), \ 25 "c" ((long)(arg2)), "d" ((long)(arg3)), \
@@ -56,12 +47,3 @@ index 5d9c2e8582f..e19e51dd304 100644
56 LSS_RETURN(int, __res); 47 LSS_RETURN(int, __res);
57 } 48 }
58 49
59@@ -2405,7 +2405,7 @@ struct kernel_statfs {
60 "d"(LSS_SYSCALL_ARG(parent_tidptr)),
61 "r"(LSS_SYSCALL_ARG(newtls)),
62 "r"(LSS_SYSCALL_ARG(child_tidptr))
63- : "rsp", "memory", "r8", "r10", "r11", "rcx");
64+ : "memory", "r8", "r10", "r11", "rcx");
65 }
66 LSS_RETURN(int, __res);
67 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
index 4730a6bd..278a9b0c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch
@@ -13,21 +13,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com
13index 17f486447fe..06c93e5b3cf 100644 13index 17f486447fe..06c93e5b3cf 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@@ -570,13 +570,6 @@ config("compiler") { 16@@ -773,8 +773,6 @@ config("compiler_cpu_abi") {
17 }
18 }
19
20- # Tells the compiler not to use absolute paths when passing the default
21- # paths to the tools it invokes. We don't want this because we don't
22- # really need it and it can mess up the goma cache entries.
23- if (is_clang && !is_nacl) {
24- cflags += [ "-no-canonical-prefixes" ]
25- }
26-
27 # C11/C++11 compiler flags setup.
28 # ---------------------------
29 if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") {
30@@ -815,8 +808,6 @@ config("compiler_cpu_abi") {
31 } 17 }
32 } else if (current_cpu == "arm") { 18 } else if (current_cpu == "arm") {
33 if (is_clang && !is_android && !is_nacl) { 19 if (is_clang && !is_android && !is_nacl) {
@@ -36,7 +22,7 @@ index 17f486447fe..06c93e5b3cf 100644
36 } 22 }
37 if (!is_nacl) { 23 if (!is_nacl) {
38 cflags += [ 24 cflags += [
39@@ -829,8 +820,6 @@ config("compiler_cpu_abi") { 25@@ -787,8 +785,6 @@ config("compiler_cpu_abi") {
40 } 26 }
41 } else if (current_cpu == "arm64") { 27 } else if (current_cpu == "arm64") {
42 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -45,7 +31,7 @@ index 17f486447fe..06c93e5b3cf 100644
45 } 31 }
46 } else if (current_cpu == "mipsel" && !is_nacl) { 32 } else if (current_cpu == "mipsel" && !is_nacl) {
47 ldflags += [ "-Wl,--hash-style=sysv" ] 33 ldflags += [ "-Wl,--hash-style=sysv" ]
48@@ -839,9 +828,6 @@ config("compiler_cpu_abi") { 34@@ -797,9 +793,6 @@ config("compiler_cpu_abi") {
49 if (is_android) { 35 if (is_android) {
50 cflags += [ "--target=mipsel-linux-android" ] 36 cflags += [ "--target=mipsel-linux-android" ]
51 ldflags += [ "--target=mipsel-linux-android" ] 37 ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +41,7 @@ index 17f486447fe..06c93e5b3cf 100644
55 } 41 }
56 } else { 42 } else {
57 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
58@@ -920,10 +906,7 @@ config("compiler_cpu_abi") { 44@@ -878,10 +871,7 @@ config("compiler_cpu_abi") {
59 } else if (current_cpu == "mips" && !is_nacl) { 45 } else if (current_cpu == "mips" && !is_nacl) {
60 ldflags += [ "-Wl,--hash-style=sysv" ] 46 ldflags += [ "-Wl,--hash-style=sysv" ]
61 if (custom_toolchain == "") { 47 if (custom_toolchain == "") {
@@ -67,7 +53,7 @@ index 17f486447fe..06c93e5b3cf 100644
67 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
68 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
69 } 55 }
70@@ -970,9 +953,6 @@ config("compiler_cpu_abi") { 56@@ -928,9 +918,6 @@ config("compiler_cpu_abi") {
71 if (is_android) { 57 if (is_android) {
72 cflags += [ "--target=mips64el-linux-android" ] 58 cflags += [ "--target=mips64el-linux-android" ]
73 ldflags += [ "--target=mips64el-linux-android" ] 59 ldflags += [ "--target=mips64el-linux-android" ]
@@ -77,7 +63,7 @@ index 17f486447fe..06c93e5b3cf 100644
77 } 63 }
78 } else { 64 } else {
79 cflags += [ 65 cflags += [
80@@ -1029,10 +1009,7 @@ config("compiler_cpu_abi") { 66@@ -987,10 +974,7 @@ config("compiler_cpu_abi") {
81 } else if (current_cpu == "mips64") { 67 } else if (current_cpu == "mips64") {
82 ldflags += [ "-Wl,--hash-style=sysv" ] 68 ldflags += [ "-Wl,--hash-style=sysv" ]
83 if (custom_toolchain == "") { 69 if (custom_toolchain == "") {
@@ -89,3 +75,17 @@ index 17f486447fe..06c93e5b3cf 100644
89 cflags += [ 75 cflags += [
90 "-EB", 76 "-EB",
91 "-mabi=64", 77 "-mabi=64",
78@@ -1169,13 +1153,6 @@ config("compiler_deterministic") {
79 }
80 }
81 }
82-
83- # Tells the compiler not to use absolute paths when passing the default
84- # paths to the tools it invokes. We don't want this because we don't
85- # really need it and it can mess up the goma cache entries.
86- if (is_clang && !is_nacl) {
87- cflags += [ "-no-canonical-prefixes" ]
88- }
89 }
90
91 config("clang_revision") {
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
index 6ad1febf..bb628fd2 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Exclude-CRC32-for-32bit-arm.patch
@@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+), 1 deletion(-) 15 1 file changed, 4 insertions(+), 1 deletion(-)
16 16
17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn 17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
18index 458f428b7ce..18b4f23f769 100644 18index 29dda54..6870dbb 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@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) { 21@@ -78,8 +78,11 @@ if (use_arm_neon_optimizations) {
22 # implement the CRC32* instructions. These are optional in ARMv8.0." 22 # Disabled for iPhone, as described in DDI0487C_a_armv8_arm:
23 # - Fuchsia just added a syscall for feature detection. 23 # "All implementations of the ARMv8.1 architecture are required to
24 # TODO(cavalcantii): crbug.com/810125. 24 # implement the CRC32* instructions. These are optional in ARMv8.0."
25+ defines = [] 25+ defines = []
26 if (is_clang && (!is_ios && !is_fuchsia)) { 26 if (!is_ios) {
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/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
index 4e976b42..12128d3c 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch
@@ -20,7 +20,7 @@ diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/com
20index 06c93e5b3cf..8ba0f8a3109 100644 20index 06c93e5b3cf..8ba0f8a3109 100644
21--- a/chromium/build/config/compiler/BUILD.gn 21--- a/chromium/build/config/compiler/BUILD.gn
22+++ b/chromium/build/config/compiler/BUILD.gn 22+++ b/chromium/build/config/compiler/BUILD.gn
23@@ -809,15 +809,6 @@ config("compiler_cpu_abi") { 23@@ -774,15 +774,6 @@ config("compiler_cpu_abi") {
24 } else if (current_cpu == "arm") { 24 } else if (current_cpu == "arm") {
25 if (is_clang && !is_android && !is_nacl) { 25 if (is_clang && !is_android && !is_nacl) {
26 } 26 }
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
index 7f6e4bdf..4dafd779 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-aarch64-skia-build-fix.patch
@@ -24,18 +24,19 @@ moment.
24 24
25Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> 25Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
26--- 26---
27 .../skia/src/opts/SkRasterPipeline_opts.h | 15 ++------------- 27 .../third_party/skia/src/opts/SkRasterPipeline_opts.h | 17 ++---------------
28 1 file changed, 2 insertions(+), 13 deletions(-) 28 1 file changed, 2 insertions(+), 15 deletions(-)
29 29
30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 30diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
31index de14e65b94e..b8be7852086 100644 31index b59506d..b8f22c9 100644
32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 32--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h 33+++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h
34@@ -729,12 +729,7 @@ SI F approx_powf(F x, F y) { 34@@ -972,13 +972,7 @@ SI F approx_powf(F x, F y) {
35 } 35 }
36 36
37 SI F from_half(U16 h) { 37 SI F from_half(U16 h) {
38-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. 38-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
39- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
39- __fp16 fp16; 40- __fp16 fp16;
40- memcpy(&fp16, &h, sizeof(U16)); 41- memcpy(&fp16, &h, sizeof(U16));
41- return float(fp16); 42- return float(fp16);
@@ -45,11 +46,12 @@ index de14e65b94e..b8be7852086 100644
45 return _mm256_cvtph_ps(h); 46 return _mm256_cvtph_ps(h);
46 47
47 #else 48 #else
48@@ -751,13 +746,7 @@ SI F from_half(U16 h) { 49@@ -995,14 +989,7 @@ SI F from_half(U16 h) {
49 } 50 }
50 51
51 SI U16 to_half(F f) { 52 SI U16 to_half(F f) {
52-#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. 53-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
54- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds.
53- __fp16 fp16 = __fp16(f); 55- __fp16 fp16 = __fp16(f);
54- U16 u16; 56- U16 u16;
55- memcpy(&u16, &fp16, sizeof(U16)); 57- memcpy(&u16, &fp16, sizeof(U16));
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
index 80ea3ae1..790bf140 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-Adjust-default-pthread-stack-size.patch
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 2 files changed, 4 insertions(+), 3 deletions(-) 10 2 files changed, 4 insertions(+), 3 deletions(-)
11 11
12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc 12diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
13index 277a7e9338d..2a6e060fa32 100644 13index 095c49b8dc0..d1479b54d48 100644
14--- a/chromium/base/threading/platform_thread_linux.cc 14--- a/chromium/base/threading/platform_thread_linux.cc
15+++ b/chromium/base/threading/platform_thread_linux.cc 15+++ b/chromium/base/threading/platform_thread_linux.cc
16@@ -186,7 +186,8 @@ void TerminateOnThread() {} 16@@ -186,7 +186,8 @@ void TerminateOnThread() {}
@@ -24,10 +24,10 @@ index 277a7e9338d..2a6e060fa32 100644
24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the 24 // ThreadSanitizer bloats the stack heavily. Evidence has been that the
25 // default stack size isn't enough for some browser tests. 25 // default stack size isn't enough for some browser tests.
26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 26diff --git a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
27index 248f93968a6..4bc5ac692af 100644 27index b2421649ff3..a31b96e90e6 100644
28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 28--- a/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc 29+++ b/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc
30@@ -30,7 +30,7 @@ size_t GetUnderestimatedStackSize() { 30@@ -29,7 +29,7 @@ size_t GetUnderestimatedStackSize() {
31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size 31 // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
32 // correctly for the main thread. 32 // correctly for the main thread.
33 33
@@ -35,8 +35,8 @@ index 248f93968a6..4bc5ac692af 100644
35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ 35+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \
36 defined(OS_FUCHSIA) 36 defined(OS_FUCHSIA)
37 // pthread_getattr_np() can fail if the thread is not invoked by 37 // pthread_getattr_np() can fail if the thread is not invoked by
38 // pthread_create() (e.g., the main thread of webkit_unit_tests). 38 // pthread_create() (e.g., the main thread of blink_unittests).
39@@ -98,7 +98,7 @@ size_t GetUnderestimatedStackSize() { 39@@ -97,7 +97,7 @@ return Threading::ThreadStackSize();
40 } 40 }
41 41
42 void* GetStackStart() { 42 void* GetStackStart() {
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 7cd006f5..8307e438 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -135,7 +135,7 @@ RDEPENDS_${PN}-examples += " \
135 qtdeclarative-qmlplugins \ 135 qtdeclarative-qmlplugins \
136" 136"
137 137
138QT_MODULE_BRANCH_CHROMIUM = "73-based" 138QT_MODULE_BRANCH_CHROMIUM = "77-based"
139 139
140# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13 140# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.13
141# 5.13.meta-qt5.2 141# 5.13.meta-qt5.2
@@ -180,8 +180,8 @@ SRC_URI_append_libc-musl = "\
180 file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 180 file://chromium/0020-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
181" 181"
182 182
183SRCREV_qtwebengine = "556576b55f6b4404c71c74a5ef8e21f87ed09854" 183SRCREV_qtwebengine = "d366f1d5d37ce6f1833ac67c7ebda540b16690f2"
184SRCREV_chromium = "843d70ac87de7482c1c1195aa73899bc05efc8f3" 184SRCREV_chromium = "939daf833fff3a9901afb6fd65d02e0f057a494a"
185SRCREV = "${SRCREV_qtwebengine}" 185SRCREV = "${SRCREV_qtwebengine}"
186 186
187SRCREV_FORMAT = "qtwebengine_chromium" 187SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb
index db56a0cb..629cc715 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 = "11b83427d9770f50b5d8ec420ec810e393f3af8c" 21SRCREV = "2f47e9505bfc3e8a8adc16e6cc3e381e98cf3c9a"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 69fd08fd..2f7ed0bb 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 = "a8bbc056335719830a6b2746b7a85cfa2fd89164" 14SRCREV = "9ef6658541c2e816b8119df98c1b66add5b7bcdd"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 9ac6bfd6..71814681 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 = "2746b310f89e99144fff2a07e945a02e8c51d3da" 22SRCREV = "a02484660ded03bc4a4ea98b1f4c5fb21afdaa4a"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 74a46c9e..07a1c059 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 = "0f6f4d20f76eaf55eebfddfe49d9a6335f443d65" 15SRCREV = "111908d734b49b31b334cd5af45064aa888ec69a"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 87e2e626..6634011e 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 = "74c5be960cbd4709cd8e4dee897cf53c00838128" 28SRCREV = "f96db4b6dbcdf9734b8f09dad479daaa923a4065"
29 29
30BBCLASSEXTEND =+ "native nativesdk" 30BBCLASSEXTEND =+ "native nativesdk"
31 31