diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-02 10:15:06 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-02 13:22:26 +0300 |
commit | b47dc504f384f1655a5c9cecb9d6ba24fcb1b10b (patch) | |
tree | b7577964b1d2444dc11f9cc7e2ae8309ba54147b | |
parent | c005ac1558415885746475b70591c3985569620f (diff) | |
download | meta-qt5-b47dc504f384f1655a5c9cecb9d6ba24fcb1b10b.tar.gz |
qt5: update submodulesv5.15.0-beta3
Update to latest content in Qt 5.15 branch.
Task-number: QTBUG-80823
Change-Id: I26c9a1587483bed96361eb49f60068826f78cf73
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/qtdeclarative_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/qtmqtt_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/qtserialbus_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtxmlpatterns_git.bb | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index cab2b295..a721b8ba 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 = "34fe5f75bcfd382b3928e221b5c9a002545fe3b9" | 198 | SRCREV = "7ed097b31f7e15812144c360021872cf8f11821e" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f4c0bc37..3b77b55b 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 = "e819e8d654fb8d15d24961d56578025c6171610c" | 39 | SRCREV = "dd84bf4a99bb181fc1176830b4504d6f023898d8" |
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 5106ced9..2817e739 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 = "34fe5f75bcfd382b3928e221b5c9a002545fe3b9" | 145 | SRCREV = "7ed097b31f7e15812144c360021872cf8f11821e" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index e005480b..cba86c63 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 = "34fe5f75bcfd382b3928e221b5c9a002545fe3b9" | 298 | SRCREV = "7ed097b31f7e15812144c360021872cf8f11821e" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3a89c308..ffed74b9 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 = "861f53d60cc2dd8bd8529c65863af881dbdd8db8" | 34 | SRCREV = "8dfcc71953cd36370bcf19f537445e3766f39635" |
35 | 35 | ||
36 | BBCLASSEXTEND =+ "native nativesdk" | 36 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 3efc5a84..a457e728 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 = "5a1a12b0e135eb49f7b232c729859583b76bd507" | 28 | SRCREV = "7625a06bd7bfcf77e896086d049b334f1b66c75d" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 6afdd077..f7f1f35b 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 = "ae9a8826d73fa689e81c43038bb13226c9cb9ac7" | 38 | SRCREV_qtlocation = "05659943df25a4ab6edcbfc8ebaa6bc23a2eb72f" |
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 338d5abc..17b7ed7b 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 = "7467bbdc843afeee748eff38f741e2417357de7a" | 12 | SRCREV = "e672503b2f4ba303617e6e1b5e3119b09d7607b0" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 16e16f70..7f1709e0 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 = "00ae18f986cadc4c888625fb63b2ca89da1f986f" | 40 | SRCREV = "d0e0119251288c9c7224c5c6797a1377032aac2f" |
diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index c4e19ae7..f59e497c 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb | |||
@@ -22,7 +22,7 @@ FILES_${PN}-qmlplugins += " \ | |||
22 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ | 22 | ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRCREV_qtquick3d = "7d23aba8c2e6c19b2ed7ad91c3e27405c211c991" | 25 | SRCREV_qtquick3d = "91704d001196be41d9cc59b22692b73cf8d409d9" |
26 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" | 26 | SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" |
27 | 27 | ||
28 | SRCREV_FORMAT = "qtquick3d_assimp" | 28 | SRCREV_FORMAT = "qtquick3d_assimp" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index c1e2007b..7c1966bc 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 = "62c8ae30880886f3ed17ddc17713db1a7410964e" | 13 | SRCREV = "e7b8ac68cf0284b97fe130d4d3676b2c651b5b05" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index eccb8ee2..3b14a48a 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 = "5c6df27b4f822cfe485154336f9143e261cb37b9" | 28 | SRCREV = "5ac51056f9b99ca6741e008bdd77cce10107bd91" |
29 | 29 | ||
30 | BBCLASSEXTEND += "native nativesdk" | 30 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index bc9c5af4..1fa6997f 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 = "1a893e24a96d9a276b68f6ae9baee9f86f885d2c" | 14 | SRCREV = "1274acb4bf4cdd06781495f5d9f90adb7268c318" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 8ba8c386..bfe98a07 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 = "02265f9bbc213d219afc345594307affb900e07e" | 52 | SRCREV = "8685a264d6961a759257bb3c8ece0beffca2bd14" |
53 | 53 | ||
54 | BBCLASSEXTEND = "native nativesdk" | 54 | BBCLASSEXTEND = "native nativesdk" |
55 | 55 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 40a0be53..5038f084 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 = "b2624d70e91c5e28740da4a0a9360d7a5b426b96" | 74 | SRCREV = "d2648237c7e3bfc03077b7b1e63c72dc24ff519c" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 0a6e3df9..0595e7f2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -189,7 +189,7 @@ 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 = "df241d1585e2ef6be28e38182cdf7e562e9c1a8a" | 192 | SRCREV_qtwebengine = "3394cde4e89463ba49af379b89863c7731c4b4ac" |
193 | SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab" | 193 | SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab" |
194 | SRCREV = "${SRCREV_qtwebengine}" | 194 | SRCREV = "${SRCREV_qtwebengine}" |
195 | 195 | ||
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 6164bf8d..c94ca0a3 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -25,6 +25,6 @@ do_configure_prepend() { | |||
25 | 25 | ||
26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" | 26 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" |
27 | 27 | ||
28 | SRCREV = "5ca8c0bc4e7e2f3af9a8d91d00ad11329a7cab8a" | 28 | SRCREV = "0964e5c37395d7d5f6c50d1e659d3bc8f2707711" |
29 | 29 | ||
30 | BBCLASSEXTEND =+ "native nativesdk" | 30 | BBCLASSEXTEND =+ "native nativesdk" |