summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-02-26 09:37:18 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2020-02-27 09:18:18 +0200
commit9be6548e07e46d037ea991955e0ddd9be635ad5a (patch)
tree784eaa444c64c1e01d1dc413c54f630b255e04db
parentb5e4f9250ae7f71901d6b076e0d46fe1d7ec673a (diff)
downloadmeta-qt5-9be6548e07e46d037ea991955e0ddd9be635ad5a.tar.gz
qt5: update submodules
Update to latest content in Qt 5.14 branch. Task-number: QTBUG-81892 Change-Id: Ie6dc04df9a62662a0394330775441cc0ba0b2ebc 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/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/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_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/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb2
16 files changed, 16 insertions, 16 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index ca602882..907a2559 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -194,4 +194,4 @@ fakeroot do_generate_qt_environment_file() {
194do_generate_qt_environment_file[umask] = "022" 194do_generate_qt_environment_file[umask] = "022"
195addtask generate_qt_environment_file after do_install before do_package 195addtask generate_qt_environment_file after do_install before do_package
196 196
197SRCREV = "d29aaf598ab565600af2619d91e05459f7bad0aa" 197SRCREV = "835e18d9ff79867f508fc8baac7fcc5bb4efc0cb"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 7b5f024c..ffce87e0 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 = "d33c1630b09fcdad83f69bfd2530354584b2f42b" 39SRCREV = "597c9df33c2c8a9e91e3ad1de48b1200ebca6586"
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 8dca0dca..b9284b86 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -142,4 +142,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 142 echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
143} 143}
144 144
145SRCREV = "d29aaf598ab565600af2619d91e05459f7bad0aa" 145SRCREV = "835e18d9ff79867f508fc8baac7fcc5bb4efc0cb"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 19512b32..eb3225e3 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 = "d29aaf598ab565600af2619d91e05459f7bad0aa" 298SRCREV = "835e18d9ff79867f508fc8baac7fcc5bb4efc0cb"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index f811f171..3ce8e3e1 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 = "9d1491a38e927893340bde238ffcefe970abd9f9" 11SRCREV = "5d0f4509012b9512e55f0a2483440d81bf32502c"
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 764c7e98..846c321d 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 = "074a8388c64feaa2388ad902906a9ac4a8a842ce" 14SRCREV = "ef3d6d957a01c836370c83fdfd64b7e54f4a6c5e"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index a97cbe13..6e175271 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 = "db6cd4110594abe09079ed4106d8fd30a848efa4" 22SRCREV = "a2769b323dc890def9dffaf98c768cec12eba3c0"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 2ebeed5f..962c454b 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 = "4e15f2135cdbefd9999a17d4e4fff5ea93679fac" 31SRCREV = "dd481a2bb4f858178b984a38cd8c3621d46446b7"
32 32
33BBCLASSEXTEND =+ "native nativesdk" 33BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 91a4d0ef..ecbe95cb 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 = "4defbd4c1b8a6450d690b11e98ae3e1f93cc96d6" 28SRCREV = "9584748fc6847240fd6b748e6735e91e451b8958"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 1bd356a9..61b9119a 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 = "f813d6af4e41b8b60652265827c0c06deb888f66" 38SRCREV_qtlocation = "1fb878d8de41a2cfd2e0afe4c939679bbb65fdb2"
39SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" 39SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
40 40
41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 41SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 3e99f5ef..e99f50bd 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 = "daac69f2f9e9ff9be06484dbdc10d139e83ab502" 40SRCREV = "12460a14bde44d1ff7bedd75bc87c7f22d096588"
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb
index ca9c0bff..56f1da9e 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 = "7e17ebbcbb5e68dd319aa7307638469c3d9f3220" 24SRCREV_qtquick3d = "82e8864f497af2b2a54d8308c793ebd1ecfc3be4"
25SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" 25SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9"
26 26
27SRCREV_FORMAT = "qtquick3d_assimp" 27SRCREV_FORMAT = "qtquick3d_assimp"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 7f8b32a0..f4a89a82 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 = "b10912ba731144e8c41cbfa35fb1553ad04b2b88" 13SRCREV = "09476c590ab13623130d5ac79045fa68e504be96"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 349b1120..3a98a793 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 = "5eedef9953db0859cf9d13b618ea51a071febe39" 39SRCREV = "bfaadab30cb804204e90498437c360b037cc0b8d"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index a5c0182b..1737f5de 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 = "a3d82bec9678fda3d8c8b7766e83267142d1ef4a" 52SRCREV = "698ffa215fd3fd7b8dd67ed9be88ca1a6731df91"
53 53
54BBCLASSEXTEND = "native nativesdk" 54BBCLASSEXTEND = "native nativesdk"
55 55
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index d4c6ab1e..56510ae3 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -180,7 +180,7 @@ SRC_URI_append_libc-musl = "\
180 file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ 180 file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
181" 181"
182 182
183SRCREV_qtwebengine = "853c29aec4b81f1d9467b5b00e98cbd3b1f95e1c" 183SRCREV_qtwebengine = "97bfaef8a39419d9524ef6ebbd073e5aee9c9c7d"
184SRCREV_chromium = "a9a20127e8adeb3f3cd7921b0bec32083103cc5c" 184SRCREV_chromium = "a9a20127e8adeb3f3cd7921b0bec32083103cc5c"
185SRCREV = "${SRCREV_qtwebengine}" 185SRCREV = "${SRCREV_qtwebengine}"
186 186