diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-06-10 09:44:54 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-06-25 13:57:31 +0300 |
commit | 1f53dbb5ce1f451d5ffe49a9541cca92d4be6ac0 (patch) | |
tree | 1c1d209bd7d40ae10559007033763e9907817af1 /recipes-qt/qt5 | |
parent | c2f3a17f625cd2e9d4f91a26b4fe15c16dfc5557 (diff) | |
download | meta-qt5-1f53dbb5ce1f451d5ffe49a9541cca92d4be6ac0.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.15 branch.
Task-number: QTBUG-84150
Change-Id: I4806d5ceab2fe045e6a7b20e617c553f259d2f1d
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtconnectivity_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtsvg_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
15 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 2237ed08..3faf3416 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -195,4 +195,4 @@ fakeroot do_generate_qt_environment_file() { | |||
195 | do_generate_qt_environment_file[umask] = "022" | 195 | do_generate_qt_environment_file[umask] = "022" |
196 | addtask generate_qt_environment_file after do_install before do_package | 196 | addtask generate_qt_environment_file after do_install before do_package |
197 | 197 | ||
198 | SRCREV = "075d971fea75f48122207dc01fce35cfdbb40daf" | 198 | SRCREV = "de6e92e26a49de4942f006c2e70f11d1dbf600d6" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index b3a18a76..9dc4a601 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 | ||
39 | SRCREV = "44fd52b3c7f6630a2b5e7dfe0963abd4a8c075ca" | 39 | SRCREV = "5f83aa911364925d93c552c4bbea885a4e2807ee" |
40 | 40 | ||
41 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index bddd01cf..9957f0da 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 | ||
145 | SRCREV = "075d971fea75f48122207dc01fce35cfdbb40daf" | 145 | SRCREV = "de6e92e26a49de4942f006c2e70f11d1dbf600d6" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d3a444c0..3d6dfd13 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 | ||
298 | SRCREV = "075d971fea75f48122207dc01fce35cfdbb40daf" | 298 | SRCREV = "de6e92e26a49de4942f006c2e70f11d1dbf600d6" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 6a17e570..1de2ef77 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 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "2f46485868a5d9f9a9035db7157864a3f5949a8a" | 22 | SRCREV = "be75143e7d6d74bf49284746afcbe26c8091f471" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 081abbe2..5f319e26 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -30,6 +30,6 @@ do_install_append_class-nativesdk() { | |||
30 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 30 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
31 | } | 31 | } |
32 | 32 | ||
33 | SRCREV = "0c8e51705ac0bb86c4b123ecd30a11b41fd50b24" | 33 | SRCREV = "ad47d70e2289d59625cd405fa54c5de2db68ad82" |
34 | 34 | ||
35 | BBCLASSEXTEND =+ "native nativesdk" | 35 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 808fdf88..8c3d5ce6 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/ |
39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 39 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
40 | 40 | ||
41 | SRCREV = "d6076e0963b16ec98c13ce126db1d94a8f2952ca" | 41 | SRCREV = "8337692ea357da48e8914e6ab87d6cb6baf17dc7" |
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 |
44 | do_install_append() { | 44 | do_install_append() { |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 9cc18271..bb06cecf 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 | ||
24 | SRCREV_qtquick3d = "31122e51d3253bf6f3bebc57745f04a3c6941c80" | 24 | SRCREV_qtquick3d = "e133dec4278ce34b68617e4ec7bbbdb841e60904" |
25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" | 25 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
26 | 26 | ||
27 | SRCREV_FORMAT = "qtquick3d_assimp" | 27 | SRCREV_FORMAT = "qtquick3d_assimp" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index dbd38e3c..104a794d 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtdeclarative qtdeclarative-native" | 11 | DEPENDS += "qtdeclarative qtdeclarative-native" |
12 | 12 | ||
13 | SRCREV = "902db8f33298dab3c9b7ae9733432d1a3e2af8e1" | 13 | SRCREV = "f66d6116b0fb84982b004e282bea9bfcfbc1f950" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 4c179b05..a0fbe193 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 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "0ef507f9cad0f9355f470e129d3dd75c623bc882" | 28 | SRCREV = "d4957cd786ac95337abf9a66e93dbce08c1a9f92" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 2914ceea..6e3b8d7d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtbase" | 13 | DEPENDS += "qtbase" |
14 | 14 | ||
15 | SRCREV = "c2d3f2833a3480d1254233a1c2a567b4e6b8bfdd" | 15 | SRCREV = "d439739e15c100f257a1a1842770c4282dc9666e" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index d7901392..00fb5021 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 | ||
52 | SRCREV = "73385a4d45d0b95e3806f78346755d1b008227b4" | 52 | SRCREV = "d4342ab7e827960c417f9aa60340e8a56ff5a1c9" |
53 | 53 | ||
54 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "native nativesdk" |
55 | 55 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 855d8ad3..f9aecee9 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 | ||
101 | SRCREV = "132bdb78342692f6f0ad2a6c703d9a67dc0227f0" | 101 | SRCREV = "ae7c48d0547391b6a247e3365f084292e8af6ec9" |
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 78bace92..632e9753 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 | ||
72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" | 72 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" |
73 | 73 | ||
74 | SRCREV = "a5442ee7e44f8907635709269661d430b4141e37" | 74 | SRCREV = "c20945c93a3d522468af343b2a82c1b69b433abe" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 74ad7ebf..f3b8ff25 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -190,8 +190,8 @@ SRC_URI_append_libc-musl = "\ | |||
190 | file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ | 190 | file://chromium/0026-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ |
191 | " | 191 | " |
192 | 192 | ||
193 | SRCREV_qtwebengine = "89d709c422fdca32e0bb0613d7ef4cfad831f706" | 193 | SRCREV_qtwebengine = "64e7fec600cf49a66d418b656bef2622529003e9" |
194 | SRCREV_chromium = "7b2f027ea83c372c33d5b50deb65a2d98244aa04" | 194 | SRCREV_chromium = "3670a2bf53ddf847b499a777161e697e08ecc26b" |
195 | SRCREV = "${SRCREV_qtwebengine}" | 195 | SRCREV = "${SRCREV_qtwebengine}" |
196 | 196 | ||
197 | SRCREV_FORMAT = "qtwebengine_chromium" | 197 | SRCREV_FORMAT = "qtwebengine_chromium" |