diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-14 15:43:24 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-01-17 11:34:31 +0000 |
commit | b676fea3938221781bf81a8cfcf40c7d2046f8d8 (patch) | |
tree | f8b63696abd263b08dff2bbe0852cdea45f8bd0d | |
parent | 713574b3e4932bb74bf8b4231d1fad67a086fbff (diff) | |
download | meta-qt5-b676fea3938221781bf81a8cfcf40c7d2046f8d8.tar.gz |
qt5: update submodules
Update to latest snapshot in Qt 5.12.1 branch
Task-number: QTBUG-72255
Change-Id: Ifd38a6fe43126a00e571799e8823723ffed4a57e
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/qtknx_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/qtnetworkauth_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebsockets_git.bb | 2 |
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 43598bbb..799181dc 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 = "f1aa4c076fd10ededea3e87b7f53da2c0be84906" | 196 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index e493751a..fcb0a5d4 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 = "d12aced2ea1673a51429a4f0c34b72c9a6a766ae" | 39 | SRCREV = "a0496abe3890766638e8601c4bd11ba1755138e3" |
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 3eb3eb79..3bb6ae9a 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -139,4 +139,4 @@ do_install() { | |||
139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake | 139 | echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake |
140 | } | 140 | } |
141 | 141 | ||
142 | SRCREV = "f1aa4c076fd10ededea3e87b7f53da2c0be84906" | 142 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4915076a..a7867563 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -253,4 +253,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
253 | 253 | ||
254 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 254 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
255 | 255 | ||
256 | SRCREV = "f1aa4c076fd10ededea3e87b7f53da2c0be84906" | 256 | SRCREV = "af821f79cacbac0be9995a7eb4a0448a9a2958bf" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 5571c0b6..ab697e1e 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 = "09e3e5438182de606ecbd8f352eddc482f78891f" | 27 | SRCREV = "95c050bb22f65ba5d8488b4a036f1c7a1223b138" |
28 | 28 | ||
29 | BBCLASSEXTEND =+ "native nativesdk" | 29 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 28a97bb0..5e16aebd 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 = "8e6b957d3711692068f3a053557610bd0450995d" | 12 | SRCREV = "19f55ce3b41e99df2dfc87934143e835c5183d82" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index cc62bd56..8fb6bd22 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 = "f1dd13632651a9efd0ea976a3efdd9c555a34bc2" | 34 | SRCREV_qtlocation = "bfb88b7a87e5dbed77d25998e386f8b5cc4e21d5" |
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 12f21ae0..358d4693 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 = "6fde0c5698d02db489a42e7108260327bae357b1" | 40 | SRCREV = "10ac932185707f0084cec7b1cfe0a6a2073b20a9" |
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 3ebee9e4..7dcb1ee6 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb | |||
@@ -9,4 +9,4 @@ require qt5-git.inc | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | SRCREV = "c6d51bdf097c133955a247c9ebc600c5bc6cff58" | 12 | SRCREV = "410c82cdd09bbcc2f236f8c2e85af726b1976904" |
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index f5ade84e..3dd61598 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase" | 11 | DEPENDS += "qtbase" |
12 | 12 | ||
13 | SRCREV = "67b40a387d92aeffd4732bc82823ec290cdec9ca" | 13 | SRCREV = "dc603eef3149cc27482e4bd1b42f299c56bee1da" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 558e088a..25b1c61c 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 = "71534dcff9d122891b5059baccd7f3dec21e063a" | 13 | SRCREV = "1157ad6df74c746e96cadac1ee9a226811f4d084" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 6e94ac9c..a90d0409 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 = "6b37c984fb82a12f0b0e065093f5b180634a9ebe" | 35 | SRCREV = "61383ceca69001c292b31188b04fba304f8fbbbe" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 295f9852..167a766a 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -172,8 +172,8 @@ SRC_URI_append_libc-musl = "\ | |||
172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ | 172 | file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ |
173 | " | 173 | " |
174 | 174 | ||
175 | SRCREV_qtwebengine = "3f501ed2cf4a0a54aeddce9e83effcd8d37c754b" | 175 | SRCREV_qtwebengine = "dde9bbb40ceed6409862e4cd31091270f99ea346" |
176 | SRCREV_chromium = "b3a4dd9ee40b959f56165d02fb87084712005c1d" | 176 | SRCREV_chromium = "fec48c17fa1853a1e42a5b6ce97680767464185d" |
177 | SRCREV = "${SRCREV_qtwebengine}" | 177 | SRCREV = "${SRCREV_qtwebengine}" |
178 | 178 | ||
179 | SRCREV_FORMAT = "qtwebengine_chromium" | 179 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 150fa852..92296b7d 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb | |||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ | |||
11 | 11 | ||
12 | DEPENDS += "qtbase qtdeclarative" | 12 | DEPENDS += "qtbase qtdeclarative" |
13 | 13 | ||
14 | SRCREV = "71fc43384f54b8b1625c22f119b88fb83670b210" | 14 | SRCREV = "ef876a7d2964f53faf160af2b01798e930dfaa94" |