summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-04-28 09:03:21 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-05-05 09:48:40 +0300
commit0ad7806ca33a715bfdc95555229428ed2be68b1f (patch)
tree61114a0a6f2d3bbc18910f1bce278133c826da7d
parent309a3454e2f333fbf042bdb56ad78cedc6c2b1bb (diff)
downloadmeta-qt5-5.15.0-rc.tar.gz
qt5: update submodulesv5.15.0-rc
Update to latest content in Qt 5.15.0 branch. Task-number: QTBUG-83792 Change-Id: I45fd0a2557a0e82aa15656ad025194be1f11ceb8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_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/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick3d_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
14 files changed, 15 insertions, 15 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index aa61085a..cd21831e 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 = "9e83d268d6e0bd492fafad823a47cef57b7916c5" 199SRCREV = "6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 682685e6..496f6ae7 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 = "ac3d2f540c7868003be65fd11e0ca28b8149a604" 39SRCREV = "5e16aa067ac6a8b5f031ffcefc356777a0da34ad"
40 40
41BBCLASSEXTEND += "native nativesdk" 41BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index da3ec610..13dd99d2 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 = "9e83d268d6e0bd492fafad823a47cef57b7916c5" 146SRCREV = "6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 9c5276c0..66602d12 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 = "9e83d268d6e0bd492fafad823a47cef57b7916c5" 298SRCREV = "6ebef2eb9a6a3630f9142fb040c3f87ba8eeac8e"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index f22c38b6..ad558468 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 = "35fe7d452d5b85eabe1c3ec9d09019fe4f3e2d2e" 22SRCREV = "eb908370e0c8212cf81f080f4bdbf663273b8063"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 8c5b38ba..b1466fe1 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 = "ec707b03c62efa8e50aa17f84d2f8d175269c96d" 34SRCREV = "4204f543eb82f96bf9f2b45b9b8b5e490517880b"
35 35
36BBCLASSEXTEND =+ "native nativesdk" 36BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index bed99508..30eb3664 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 = "c7c320bf134e6df6a98f10c357ff36e2c8008e53" 28SRCREV = "b26e5fbf4c50b70ec773a0265c27bb3b262c71ed"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index 1b5d0711..9e964298 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 = "f5cc3184f30c9fa1b81d931430aaa4f6f23267a3" 12SRCREV = "eeac38075b17ae74821e9976d3dd37346a4f822c"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index d3992b5b..a0e91f13 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -38,7 +38,7 @@ SRC_URI += "\
38# http://errors.yoctoproject.org/Errors/Build/44914/ 38# http://errors.yoctoproject.org/Errors/Build/44914/
39LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 39LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
40 40
41SRCREV = "3ce4b38a7c6711ea378a56baec84b73da55a9c84" 41SRCREV = "83f0038fa7fd090840fdd19fd30652bd7bbb6fd3"
42 42
43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory 43# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
44do_install_append() { 44do_install_append() {
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index 9a26af41..f46a7a21 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 = "962950bfb11458cfddb3b7271ea9516c2e498cdf" 24SRCREV_qtquick3d = "ba9d56b6d89fc70ea4eb331a8e6b1fde242fd68a"
25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" 25SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
26 26
27SRCREV_FORMAT = "qtquick3d_assimp" 27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index b8968781..2490d4e6 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
49 ${@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)} \
50" 50"
51 51
52SRCREV = "e967772fe884dd8a488a359c122c9cbae9d94c55" 52SRCREV = "94e861104a1d689dfd12018e7be377699ab24917"
53 53
54BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
55 55
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index bc3f12dd..18fa8d09 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu
43 43
44EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 44EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
45 45
46SRCREV = "4bd13402f0293e85b8dfdf92254e250ac28094c7" 46SRCREV = "efc94a48526baf92b8a78916e03e1fef5993fa95"
47 47
48BBCLASSEXTEND =+ "native nativesdk" 48BBCLASSEXTEND =+ "native nativesdk"
49 49
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 05862804..cb62faaf 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -189,8 +189,8 @@ SRC_URI_append_libc-musl = "\
189 file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 189 file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
190" 190"
191 191
192SRCREV_qtwebengine = "39c6581c8d9ee6a01a03f4f413e218c1d373da3c" 192SRCREV_qtwebengine = "950e462b1d369f8140a1d54078d42b5f057adfdb"
193SRCREV_chromium = "88274f362d7d144a8e1ef4ade0fa3c4038ad414e" 193SRCREV_chromium = "6f260e5b2f717b9977045419f12c7c35d31f9a90"
194SRCREV = "${SRCREV_qtwebengine}" 194SRCREV = "${SRCREV_qtwebengine}"
195 195
196SRCREV_FORMAT = "qtwebengine_chromium" 196SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 02b25895..a1861a53 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 = "d937c580ec5ce24a4aad6cc9e4927cad5a93acda" 14SRCREV = "6efa2ea5fd6eb35fd07b97f643d1e8e376f2eda0"