diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-18 11:52:37 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-23 11:31:33 +0200 |
commit | cbf2529a89af9ea853d0d73dc1439fa1af36d007 (patch) | |
tree | 11b628efd69b157f27c3a8500363b8a0e328aeea | |
parent | ef88f723354f9d82316735c4a1b8d5e681749004 (diff) | |
download | meta-qt5-cbf2529a89af9ea853d0d73dc1439fa1af36d007.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.14.2 branch.
Task-number: QTBUG-81892
Change-Id: I9c193d37ded2e4902e65c6dfcf2e7c388eca1971
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_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/qtcoap_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/qtknx_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmqtt_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 |
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 2ff9747b..cd7800d9 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() { | |||
194 | do_generate_qt_environment_file[umask] = "022" | 194 | do_generate_qt_environment_file[umask] = "022" |
195 | addtask generate_qt_environment_file after do_install before do_package | 195 | addtask generate_qt_environment_file after do_install before do_package |
196 | 196 | ||
197 | SRCREV = "ddd0919bcf5bb630efce755cc21f364e36e23fca" | 197 | SRCREV = "1a18e138f4d17c219c6ffd6e4396c30b960818b4" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 8c17606f..247b2626 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 = "ddd0919bcf5bb630efce755cc21f364e36e23fca" | 145 | SRCREV = "1a18e138f4d17c219c6ffd6e4396c30b960818b4" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index f5f5440d..1cc39f78 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -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 | ||
299 | SRCREV = "ddd0919bcf5bb630efce755cc21f364e36e23fca" | 299 | SRCREV = "1a18e138f4d17c219c6ffd6e4396c30b960818b4" |
diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index 846c321d..c65419dc 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb | |||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" | |||
11 | 11 | ||
12 | DEPENDS += "qtbase" | 12 | DEPENDS += "qtbase" |
13 | 13 | ||
14 | SRCREV = "ef3d6d957a01c836370c83fdfd64b7e54f4a6c5e" | 14 | SRCREV = "ce5087822071d59cedd6913d4b28304aacc3c80b" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index d1cacd27..5f6e461f 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 = "58e0224a6677667b1102b34ad5b35a787bd74077" | 22 | SRCREV = "b445ea4ff203fbcb5011adae0236dd028f11bc89" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index e2c0bcad..b588df0e 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 | ||
34 | SRCREV = "b67264a2644b22dc23f6a06ff48974c77cb45d84" | 34 | SRCREV = "23a000f9a14889753a63cd73de2c61e49bb7e0d8" |
35 | 35 | ||
36 | BBCLASSEXTEND =+ "native nativesdk" | 36 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index c835c023..ae17b92b 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "2d5aac2c4835286c6ba881d97a73f04093be556e" | 12 | SRCREV = "c910588bee331165350dbd83a9b1fdf92020c2f1" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 475471d7..2cbb44a6 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 | ||
38 | SRCREV_qtlocation = "07de1d0f0f93b742434e2fcfda70bf70cb6373c9" | 38 | SRCREV_qtlocation = "feb604c32611183083855c04b07c6be1e0efc9c6" |
39 | SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" | 39 | SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" |
40 | 40 | ||
41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 41 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index f2205059..a0a67f05 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "dbaa4a3678bb92095bbc187318bee32598f2ff3f" | 12 | SRCREV = "9548b694a4b04c6164debb821a9c3536860f9421" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index a513ce4b..fea783b7 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" | |||
18 | 18 | ||
19 | DEPENDS += "qtbase" | 19 | DEPENDS += "qtbase" |
20 | 20 | ||
21 | SRCREV = "3cfd1f282258477d875482cf9df0dcd3de3019e1" | 21 | SRCREV = "2d99281fe78e6cdcf65d138c8503653ba46eccef" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 4afe039f..7d3fd78b 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 = "2c425cf308188a0b3fc3f288ee71934a4ed4da40" | 24 | SRCREV_qtquick3d = "a0197a18cebfb718c1787fcd8779bcf237f97137" |
25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" | 25 | SRCREV_assimp = "5c900d689a5db5637b98f665fc1e9e9c9ed416b9" |
26 | 26 | ||
27 | SRCREV_FORMAT = "qtquick3d_assimp" | 27 | SRCREV_FORMAT = "qtquick3d_assimp" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 08838b87..ee7a90df 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 = "14daacff9654980381a1d0b7b09d0b25f6c9dbb2" | 28 | SRCREV = "c64237289a6287c23564827b51092e58a1e6cbac" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 7cdaf575..249d8076 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 = "d482bfef233be2aea221533dd0c4bd695875fad7" | 52 | SRCREV = "9d5d92a49256af65a85fa69b58e6744c2722321b" |
53 | 53 | ||
54 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "native nativesdk" |
55 | 55 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 2752f7de..bf91b8da 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/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 189 | file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
190 | " | 190 | " |
191 | 191 | ||
192 | SRCREV_qtwebengine = "1c8498cbc6929465c5acc33edfcc505bc3664720" | 192 | SRCREV_qtwebengine = "98af37969ec9cfd4eaa28884ea6d21dfbe008764" |
193 | SRCREV_chromium = "4af826b4d3512f93c6aaf891c9e4434da0f8a7f6" | 193 | SRCREV_chromium = "f7ffd2f7dffd911e37f6a638bb410bd71da23491" |
194 | SRCREV = "${SRCREV_qtwebengine}" | 194 | SRCREV = "${SRCREV_qtwebengine}" |
195 | 195 | ||
196 | SRCREV_FORMAT = "qtwebengine_chromium" | 196 | SRCREV_FORMAT = "qtwebengine_chromium" |