diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-25 09:19:37 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-01 07:06:38 +0000 |
commit | 439f7be65f681d4e45f30571082e38791cca2ef2 (patch) | |
tree | 6659073bc13b800e660067f592f78e7ac8c0bd93 | |
parent | c8c8613d679241b2ceac39e248a3062cc2e56ccd (diff) | |
download | meta-qt5-439f7be65f681d4e45f30571082e38791cca2ef2.tar.gz |
qt5: update submodules
Update to Qt latest content in 5.12.2 branch (RC)
Task-number: QTBUG-73533
Change-Id: I3e79964301632dbf8d19b06cb7e6e8ce745793de
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
23 files changed, 23 insertions, 23 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6527d730..e312b44c 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 = "0f163887b526d00ccdcead907dde042aa370fc16" | 196 | SRCREV = "e8d3306c8f86bf21648693521d8be91bb8f1335e" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f33263ba..a3b62f8d 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 = "b237f38e89016b40861de1e0675dc2ba5b3f361a" | 39 | SRCREV = "3de900a10c6fd051ba54727be2fd1fe47ed10481" |
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 445b1846..3bc4f931 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 = "0f163887b526d00ccdcead907dde042aa370fc16" | 142 | SRCREV = "e8d3306c8f86bf21648693521d8be91bb8f1335e" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 74d9ee62..88f68a2f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -263,4 +263,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
263 | 263 | ||
264 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 264 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
265 | 265 | ||
266 | SRCREV = "0f163887b526d00ccdcead907dde042aa370fc16" | 266 | SRCREV = "e8d3306c8f86bf21648693521d8be91bb8f1335e" |
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 074bfc27..d69124bc 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ | |||
8 | 8 | ||
9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" | 9 | DEPENDS += "qtbase qtdeclarative qtmultimedia" |
10 | 10 | ||
11 | SRCREV = "694cf2bb87352f99e56aa687e13fdc7eeea40720" | 11 | SRCREV = "c9bc2672b513a414708026f4271d247feaa26471" |
12 | 12 | ||
13 | # The same issue as in qtbase: | 13 | # The same issue as in qtbase: |
14 | # http://errors.yoctoproject.org/Errors/Details/152641/ | 14 | # http://errors.yoctoproject.org/Errors/Details/152641/ |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index a9f18a30..2d9298db 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 = "1b19d7981610c2a9587544da654b4ca783e1bf6b" | 24 | SRCREV = "eec8fed760a572eb9187f79b43d87986f2b4f404" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 446ec50c..3cac4441 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 = "407e2769c7b7909fdb2979090e71fa636f109a04" | 27 | SRCREV = "cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f" |
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 4a3be7f3..70ac2cbe 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 = "8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba39" | 17 | SRCREV = "744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 62699c44..0d75655d 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 = "0e8422bedc8c84ff7c08c6b3163329e82c2007dd" | 28 | SRCREV = "1b8478f86f15dc1dd125a2a0d8331bc3600a79c1" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 74767c6d..8cac62ef 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 = "633b0f40ca82709863bad48e0ed6a1c92ad3b8b4" | 34 | SRCREV_qtlocation = "a00c5e40a2df03713d29da83a5692f2d7c15326d" |
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 b02a9b48..469529d1 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 = "4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe" | 40 | SRCREV = "9caf4812e073829fc961eb466f1325106f041841" |
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 6fcf6025..2cf778c3 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb | |||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative" | 11 | DEPENDS += "qtbase qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "dff997ecf2984acd7eae650e8ffe3269e6b2a5e2" | 13 | SRCREV = "2234141c0ec838dd537bec909c87e8a184125f68" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index efcc4e8a..5d18f977 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 = "0dfc617e4d089f7513573673d12f9678a88d3081" | 13 | SRCREV = "ca799283a2266b023923286b4928fdf6e7211569" |
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 0d31eaa1..d4ea6186 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 = "b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e" | 20 | SRCREV = "c231395eec3494619f4977b4c5cd845b9d7341ae" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index eb280159..ff934bde 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | SRCREV = "5f94145128035bce167ca23780296564aa5f25d1" | 27 | SRCREV = "1c19349a28a75eec386b84af142fc571e492a3c3" |
28 | 28 | ||
29 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 19e64d61..132d69e2 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 = "5a9de40f48f5854b6ff20329ced0f0509b81b48a" | 39 | SRCREV = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361" |
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index bc706660..91b2cde2 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb | |||
@@ -10,7 +10,7 @@ require qt5-git.inc | |||
10 | 10 | ||
11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" | 11 | DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" |
12 | 12 | ||
13 | SRCREV = "dca1cd7cfb03ba383012dbfcf7b40924ac887bf8" | 13 | SRCREV = "4bb7aa3f3002b9ba85494e5cf4808f68e0edc502" |
14 | 14 | ||
15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 | 15 | # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 |
16 | # 5.12.meta-qt5.1 | 16 | # 5.12.meta-qt5.1 |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index b8141eed..3345f7df 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 = "670f912fbc08002ac063504755fc7705931e0d6e" | 14 | SRCREV = "745120ddca5fa67f1a87741e0a5c016acbd53deb" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f521d03f..be967149 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 = "6c8d836335a0eb57c76aee78b700893ca014fc90" | 35 | SRCREV = "b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8" |
36 | 36 | ||
37 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
38 | 38 | ||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 51fea202..a63c49cd 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "4b58ff21f4a3c629867064289b6c778bbb57f95a" | 40 | SRCREV = "0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb" |
41 | 41 | ||
42 | BBCLASSEXTEND =+ "native nativesdk" | 42 | BBCLASSEXTEND =+ "native nativesdk" |
43 | 43 | ||
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 1435caa1..b039ba38 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb | |||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ | |||
12 | 12 | ||
13 | DEPENDS += "qtdeclarative qtwebsockets" | 13 | DEPENDS += "qtdeclarative qtwebsockets" |
14 | 14 | ||
15 | SRCREV = "d14c6aa5855ebfb8bb624efd7817bb3cdd4c96e4" | 15 | SRCREV = "45da510a0a87593a2ae6f98e41bb01b9d39ace58" |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 0c6be5a9..fb999c66 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -174,7 +174,7 @@ 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 = "8fefc0d9b8ae46d65e8c05f9cc55bbfc0e88b632" | 177 | SRCREV_qtwebengine = "b47b28d3cfb8b249cce343031507864de99117a7" |
178 | SRCREV_chromium = "493fab1afff5034cb5552455add3af3aaf41f9e9" | 178 | SRCREV_chromium = "493fab1afff5034cb5552455add3af3aaf41f9e9" |
179 | SRCREV = "${SRCREV_qtwebengine}" | 179 | SRCREV = "${SRCREV_qtwebengine}" |
180 | 180 | ||
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 091c5e98..a7a66387 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" | |||
19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" | 19 | COMPATIBLE_MACHINE_armv7ve = "(.*)" |
20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" | 20 | COMPATIBLE_MACHINE_aarch64 = "(.*)" |
21 | 21 | ||
22 | SRCREV = "17334eb56b42114927169ee8eec6512754674fb2" | 22 | SRCREV = "0aa43dc555e0a820bf13a6b12671ee6a79161155" |