summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-05-07 10:47:27 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-05-11 08:20:43 +0300
commit999a301f64894a12dc0f0caeb8af240c73c8a332 (patch)
treeb6a8749f0dad9026c2bda88cba2532e203132b7b
parent0ad7806ca33a715bfdc95555229428ed2be68b1f (diff)
downloadmeta-qt5-999a301f64894a12dc0f0caeb8af240c73c8a332.tar.gz
qt5: update submodulesv5.15.0-rc2
Update to Qt 5.15.0 RC2 Task-number: QTBUG-80823 Change-Id: I5541f9f2ee80ddd667ad809fd034762d9b990800 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb4
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch17
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch50
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb5
10 files changed, 12 insertions, 76 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index cd21831e..f38dd2b2 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -196,4 +196,4 @@ fakeroot do_generate_qt_environment_file() {
196do_generate_qt_environment_file[umask] = "022" 196do_generate_qt_environment_file[umask] = "022"
197addtask generate_qt_environment_file after do_install before do_package 197addtask generate_qt_environment_file after do_install before do_package
198 198
199SRCREV = "6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e" 199SRCREV = "a8b373d678f44a9d7006a412cabc75e7586b2c43"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 13dd99d2..3990436b 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -143,4 +143,4 @@ do_install() {
143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake 143 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
144} 144}
145 145
146SRCREV = "6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e" 146SRCREV = "a8b373d678f44a9d7006a412cabc75e7586b2c43"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 66602d12..3777bae5 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -295,4 +295,4 @@ sed -i \
295 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri 295 $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
296} 296}
297 297
298SRCREV = "6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e" 298SRCREV = "a8b373d678f44a9d7006a412cabc75e7586b2c43"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index b1466fe1..7ae8e9a3 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -31,6 +31,6 @@ do_install_append_class-nativesdk() {
31 rm -rf ${D}${OE_QMAKE_PATH_QML} 31 rm -rf ${D}${OE_QMAKE_PATH_QML}
32} 32}
33 33
34SRCREV = "4204f543eb82f96bf9f2b45b9b8b5e490517880b" 34SRCREV = "829da623961b9d4e8c3a2236cb9580dec97c2483"
35 35
36BBCLASSEXTEND =+ "native nativesdk" 36BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index c4e39ce1..e2900e42 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -35,7 +35,7 @@ SRC_URI += " \
35 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 35 ${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" 36"
37 37
38SRCREV_qtlocation = "145a28ad34837bee8ba3d2acd9932d1b7825fd78" 38SRCREV_qtlocation = "b2d0a90961089057acf199119afa8235e9e926b3"
39SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" 39SRCREV_qtlocation-mapboxgl = "d7e368c42f2ac7971e81f60b981e566352f1e4fa"
40 40
41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index ed58aa85..cb1b63b7 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 = "6ad275b1eb35c4e9d75e217adaad4f5101a3bb28" 12SRCREV = "8e6e45b990a0ad9bc0d43f1f5387d34a212441bd"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index f46a7a21..a3e9226a 100644
--- a/recipes-qt/qt5/qtquick3d_git.bb
+++ b/recipes-qt/qt5/qtquick3d_git.bb
@@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ 21 ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
22" 22"
23 23
24SRCREV_qtquick3d = "ba9d56b6d89fc70ea4eb331a8e6b1fde242fd68a" 24SRCREV_qtquick3d = "c9073f11ba540353aa5e3a6f8653569daf9ed606"
25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" 25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
26 26
27SRCREV_FORMAT = "qtquick3d_assimp" 27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
index e494e061..28e672bd 100644
--- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
+++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch
@@ -1,4 +1,4 @@
1From e8f23ce32baf1e0d9c2249e50c949c9cd86095e0 Mon Sep 17 00:00:00 2001 1From 40368b5ef391a2d47d3d83f33d97ac7a7dcf3ff7 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 25 Dec 2019 15:41:16 -0800 3Date: Wed, 25 Dec 2019 15:41:16 -0800
4Subject: [PATCH] chromium: Include cstddef for size_t definition 4Subject: [PATCH] chromium: Include cstddef for size_t definition
@@ -18,22 +18,9 @@ ccc
18 18
19Signed-off-by: Khem Raj <raj.khem@gmail.com> 19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20--- 20---
21 .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 +
22 .../third_party/webrtc/modules/video_coding/decoding_state.h | 1 + 21 .../third_party/webrtc/modules/video_coding/decoding_state.h | 1 +
23 2 files changed, 2 insertions(+) 22 1 file changed, 1 insertion(+)
24 23
25diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
26index 22528c94892..69e624e8b19 100644
27--- a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
28+++ b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
29@@ -12,6 +12,7 @@
30 #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
31
32 #include <array>
33+#include <cstddef>
34
35 namespace webrtc {
36
37diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 24diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
38index b87fb2d0345..b3faffcfc79 100644 25index b87fb2d0345..b3faffcfc79 100644
39--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h 26--- a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
deleted file mode 100644
index d97e9bd7..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Include-cstddef-and-cstdint.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 75d5b91b202dc2f5ff380cc36fdb9ac50f6c80ca Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 15 Jan 2020 16:53:46 -0800
4Subject: [PATCH] chromium: Include <cstddef> and <cstdint>
5
6These headers are needed for uintXX_t and size_t definitions
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 chromium/media/cdm/supported_cdm_versions.h | 1 +
11 .../third_party/perfetto/include/perfetto/base/task_runner.h | 1 +
12 chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 +
13 3 files changed, 3 insertions(+)
14
15diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
16index dbe59ba5ea7..5216cfe3ee9 100644
17--- a/chromium/media/cdm/supported_cdm_versions.h
18+++ b/chromium/media/cdm/supported_cdm_versions.h
19@@ -6,6 +6,7 @@
20 #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
21
22 #include <array>
23+#include <cstddef>
24
25 #include "media/base/media_export.h"
26 #include "media/cdm/api/content_decryption_module.h"
27diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
28index cf60401238f..02658e7139b 100644
29--- a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
30+++ b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
31@@ -18,6 +18,7 @@
32 #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
33
34 #include <functional>
35+#include <cstdint>
36
37 #include "perfetto/base/export.h"
38
39diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
40index 8ffa4400a9c..a389fc2a574 100644
41--- a/chromium/third_party/webrtc/call/rtx_receive_stream.h
42+++ b/chromium/third_party/webrtc/call/rtx_receive_stream.h
43@@ -11,6 +11,7 @@
44 #ifndef CALL_RTX_RECEIVE_STREAM_H_
45 #define CALL_RTX_RECEIVE_STREAM_H_
46
47+#include <cstdint>
48 #include <map>
49
50 #include "call/rtp_packet_sink_interface.h"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index cb62faaf..bb4c5e9f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -169,7 +169,6 @@ SRC_URI += " \
169 file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ 169 file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \
170 file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \ 170 file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \
171 file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ 171 file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \
172 file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \
173 file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ 172 file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \
174" 173"
175 174
@@ -189,8 +188,8 @@ SRC_URI_append_libc-musl = "\
189 file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 188 file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
190" 189"
191 190
192SRCREV_qtwebengine = "950e462b1d369f8140a1d54078d42b5f057adfdb" 191SRCREV_qtwebengine = "387fb9377d61683bcd0f59a637afffdd9a16912c"
193SRCREV_chromium = "6f260e5b2f717b9977045419f12c7c35d31f9a90" 192SRCREV_chromium = "623647821aa7c7565ed5153a27c5a1bb088efbe6"
194SRCREV = "${SRCREV_qtwebengine}" 193SRCREV = "${SRCREV_qtwebengine}"
195 194
196SRCREV_FORMAT = "qtwebengine_chromium" 195SRCREV_FORMAT = "qtwebengine_chromium"