diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-01 12:30:54 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-02 11:38:46 +0000 |
commit | f2b9b3047d2684a52d525618ef0a326f97e3e37b (patch) | |
tree | 34bcb043d9ce84eeb542b3dce1430a8d69fc889f | |
parent | 51064b498e54f519888f478ea83ac3b93a5615f8 (diff) | |
download | meta-qt5-f2b9b3047d2684a52d525618ef0a326f97e3e37b.tar.gz |
qt5: update submodules
Update to latest content in Qt 5.12.3 branch
Task-number: QTBUG-74623
Change-Id: I38f29200c051da3d34c768043a1f4d5bd4e5dd6e
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/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/qtgamepad_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtimageformats_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtlocation_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmultimedia_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtscript_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtserialbus_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/qtwebengine_git.bb | 4 |
17 files changed, 18 insertions, 18 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 7bb02252..0c6df454 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() { | |||
193 | do_generate_qt_environment_file[umask] = "022" | 193 | do_generate_qt_environment_file[umask] = "022" |
194 | addtask generate_qt_environment_file after do_install before do_package | 194 | addtask generate_qt_environment_file after do_install before do_package |
195 | 195 | ||
196 | SRCREV = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" | 196 | SRCREV = "18e4cf290048726933bb5cf487e947e65b3550a6" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index fdfaed42..2026a701 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 = "fa12f14b2b97249b68652ed9f5fd0df0c0c27be4" | 39 | SRCREV = "e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246" |
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 e6c6a462..6830fe88 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -140,4 +140,4 @@ do_install() { | |||
140 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 140 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
141 | } | 141 | } |
142 | 142 | ||
143 | SRCREV = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" | 143 | SRCREV = "18e4cf290048726933bb5cf487e947e65b3550a6" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5b875588..2214a83e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -284,4 +284,4 @@ sed -i \ | |||
284 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri | 284 | $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri |
285 | } | 285 | } |
286 | 286 | ||
287 | SRCREV = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" | 287 | SRCREV = "18e4cf290048726933bb5cf487e947e65b3550a6" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 1901c226..17062177 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb | |||
@@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" | |||
21 | 21 | ||
22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 22 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
23 | 23 | ||
24 | SRCREV = "c488aedb42cda76085cfc0ed2602c34c3b5353a6" | 24 | SRCREV = "d21da7829811d129b96ca0eb2a56cb6bdae4f1a7" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index b6099d62..fd33c199 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { | |||
24 | rm -rf ${D}${OE_QMAKE_PATH_QML} | 24 | rm -rf ${D}${OE_QMAKE_PATH_QML} |
25 | } | 25 | } |
26 | 26 | ||
27 | SRCREV = "42ed40cf0abd0155d6e6d1ef01faf9bded065588" | 27 | SRCREV = "8c1c579405cb4a3b039b171a1fa5d636deed9511" |
28 | 28 | ||
29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 5892435f..5f62acf2 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb | |||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" | |||
14 | 14 | ||
15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 15 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
16 | 16 | ||
17 | SRCREV = "cd571466dc25674b25f34a3e2476c6a0b53dd25f" | 17 | SRCREV = "c6cb03e61ed17c92b316ab0d6af86278c6abd45c" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 084d056b..3eead993 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 | ||
26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 26 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
27 | 27 | ||
28 | SRCREV = "4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a" | 28 | SRCREV = "434aa248ad5710c7f65283fc3beb7e8adb8b1ad7" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 2db973b7..991e5771 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -31,7 +31,7 @@ SRC_URI += " \ | |||
31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 31 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
32 | " | 32 | " |
33 | 33 | ||
34 | SRCREV_qtlocation = "6e02f895a8f3a74503971dd8df02cfafd46281f8" | 34 | SRCREV_qtlocation = "5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac" |
35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" | 35 | SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" |
36 | 36 | ||
37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 37 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 30f1b204..7fc7ca14 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/ |
38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 38 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
39 | 39 | ||
40 | SRCREV = "d665520e8bd23121160d82cada34ff625e0d0cfe" | 40 | SRCREV = "f41819387531a5ddfbad2e80ceec7b57a5ebb7c6" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e55e2bf5..2416815c 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 = "5135bec50762955b3a1138ecda10214a9d0bf62a" | 13 | SRCREV = "1bb25edd6c30e163976afa43065671ffcb56d6f4" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 3ebc8527..0b9acfd4 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb | |||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ | |||
17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ | 17 | ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRCREV = "c901f6d2ee7f73f58881424b05d57360720fa7d9" | 20 | SRCREV = "1edf84eff083eb5412b4c5c7cd3bd8166f15f61f" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 550d03a3..a458cce9 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/ |
37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 37 | LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |
38 | 38 | ||
39 | SRCREV = "6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b" | 39 | SRCREV = "2379c9b93792feb97d6cb871082aed0f7cbcbad8" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 357bb195..9e1f80a2 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtserialport" | 12 | DEPENDS += "qtbase qtserialport" |
13 | 13 | ||
14 | SRCREV = "4a52df0a7d5e0bc825a39d8f1f3764f45908fe75" | 14 | SRCREV = "d5b3a2b6e6462f4ad46fce8f52539333b131dcad" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 9528b674..99fbd90f 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
33 | " | 33 | " |
34 | 34 | ||
35 | SRCREV = "9c7502b0e5056da021ace0195e53d5b7b410120b" | 35 | SRCREV = "50335cb26bb88930f5e2a204642439cc9a4d2282" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 368dece5..f06ca308 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 = "7baf16d13b463ed86879e8a109ff3b4ba4ae8e46" | 101 | SRCREV = "0987e6cb7f415be17d1240c8cd71719f94a98f76" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index aeaab374..3f94afa3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\ | |||
174 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 174 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
175 | " | 175 | " |
176 | 176 | ||
177 | SRCREV_qtwebengine = "1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b" | 177 | SRCREV_qtwebengine = "1110b9b50e61bf2663e2037ce9e28e74a8943919" |
178 | SRCREV_chromium = "69388ae5e24df85a68354c3b330514756129d871" | 178 | SRCREV_chromium = "e8bb1f1a6b2877c86519749ffab34f94bb6a1028" |
179 | SRCREV = "${SRCREV_qtwebengine}" | 179 | SRCREV = "${SRCREV_qtwebengine}" |
180 | 180 | ||
181 | SRCREV_FORMAT = "qtwebengine_chromium" | 181 | SRCREV_FORMAT = "qtwebengine_chromium" |