diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-21 13:35:41 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-22 12:54:45 +0000 |
commit | a429f4f8ef5142201b6bd978e598b1976428762b (patch) | |
tree | 943b7510c420fc8cf75c2a2c92ae1d249f005a24 | |
parent | b04b2385c89f1b66ce2ae3b381d41090db5249e0 (diff) | |
download | meta-qt5-a429f4f8ef5142201b6bd978e598b1976428762b.tar.gz |
qt5: update submodules
Qt 5.9.1 RC
Change-Id: Icc5b142d86739ac6dd298187ee22f460972fbd5b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
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/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/qtremoteobjects_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/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwebview_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qtxmlpatterns_git.bb | 2 |
20 files changed, 21 insertions, 21 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index a96d3f60..81c9e51b 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { | |||
191 | 191 | ||
192 | addtask generate_qt_environment_file after do_install before do_package | 192 | addtask generate_qt_environment_file after do_install before do_package |
193 | 193 | ||
194 | SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" | 194 | SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" |
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f5164f22..ceaa8c93 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -34,6 +34,6 @@ do_configure_prepend() { | |||
34 | ${S}/src/quick3d/imports/input/importsinput.pro | 34 | ${S}/src/quick3d/imports/input/importsinput.pro |
35 | } | 35 | } |
36 | 36 | ||
37 | SRCREV = "ab0a43e9efba3da95da2ebc7662a1437d5e3a899" | 37 | SRCREV = "e35b41fa9f713dcbfb7299b9effeadf52cfb6353" |
38 | 38 | ||
39 | BBCLASSEXTEND += "native nativesdk" | 39 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 309672f6..04c8206e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb | |||
@@ -109,4 +109,4 @@ do_install() { | |||
109 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} | 109 | install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} |
110 | } | 110 | } |
111 | 111 | ||
112 | SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" | 112 | SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4cc5f99c..562a36cd 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" | |||
182 | 182 | ||
183 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" | 183 | RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" |
184 | 184 | ||
185 | SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" | 185 | SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" |
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index bc7c2e18..3e87a809 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,${BLUEZ}" | |||
19 | 19 | ||
20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 20 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
21 | 21 | ||
22 | SRCREV = "e5ed5619e6a5ca79474bf922743b6f56bd8058ab" | 22 | SRCREV = "1ed8390e17831afc5624bc7519b667eb8eea05a7" |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 94a09778..7f0f7afe 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { | |||
32 | 32 | ||
33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 33 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
34 | 34 | ||
35 | SRCREV = "d8f84e5769632544dfac5138348481330c4da4cd" | 35 | SRCREV = "7d28940a316128c8ee43def83a71843711d702c9" |
36 | 36 | ||
37 | BBCLASSEXTEND =+ "native nativesdk" | 37 | BBCLASSEXTEND =+ "native nativesdk" |
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 0e5a5258..51cddccb 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb | |||
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" | |||
26 | 26 | ||
27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 27 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
28 | 28 | ||
29 | SRCREV = "c1645fee237213074c5b3b53c21e8d9cd3a21167" | 29 | SRCREV = "6a325512a8d50f68a650ec9822dcd918653567c4" |
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index d058f43b..a953ee58 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb | |||
@@ -28,7 +28,7 @@ SRC_URI += " \ | |||
28 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ | 28 | ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ |
29 | " | 29 | " |
30 | 30 | ||
31 | SRCREV_qtlocation = "d89701c5c8646dedb0ebb2e011c4da796a6ae8a1" | 31 | SRCREV_qtlocation = "0871241358ae3d98c9143b9b6a308ac4914712f2" |
32 | SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" | 32 | SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" |
33 | 33 | ||
34 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" | 34 | SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" |
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index d242733b..ab04a6cc 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb | |||
@@ -29,4 +29,4 @@ SRC_URI += "\ | |||
29 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ | 29 | file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ |
30 | " | 30 | " |
31 | 31 | ||
32 | SRCREV = "a6cc1af0546ab10701c10475315139ebb50ad1e5" | 32 | SRCREV = "b934cf056e3875a13af48eefe519cffe1332cde2" |
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 422f8216..da92d42d 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" | 11 | DEPENDS += "qtdeclarative" |
12 | 12 | ||
13 | SRCREV = "6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0" | 13 | SRCREV = "0d851ddab069bd4373e90beacba0efa38ec021bb" |
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index c5ffd261..f92d0832 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -22,6 +22,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
22 | 22 | ||
23 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 23 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
24 | 24 | ||
25 | SRCREV = "68f876f17b21ec0c95d1e487238f264b5a568c65" | 25 | SRCREV = "2ca7b229f7552c28f906c0efff8a662c06cc2e40" |
26 | 26 | ||
27 | BBCLASSEXTEND += "native nativesdk" | 27 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 8423b583..2ca38919 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb | |||
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" | |||
25 | 25 | ||
26 | DEPENDS += "qtbase" | 26 | DEPENDS += "qtbase" |
27 | 27 | ||
28 | SRCREV = "ab816ddbfeca2ff6dadca0a31de168f1a5a3f7f4" | 28 | SRCREV = "dc65e802cae6751b167ada36b45f5b7ec53a1865" |
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index ba100add..a2c631e0 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 = "8cec9f474af2cf654828b5d47b166da7d3c36574" | 14 | SRCREV = "b919d62924f0f347c7c356f1cc1b2da55a637e40" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f13b7bbd..6903edf7 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" | |||
27 | 27 | ||
28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" | 28 | EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" |
29 | 29 | ||
30 | SRCREV = "80c135154c1e78c7af7d6d54129e009bc6015c33" | 30 | SRCREV = "6ccb19d3608709bd874819049019cb78f1cca017" |
31 | 31 | ||
32 | BBCLASSEXTEND = "native nativesdk" | 32 | BBCLASSEXTEND = "native nativesdk" |
33 | 33 | ||
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 82f31248..08e9c1fc 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb | |||
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" | |||
49 | 49 | ||
50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" | 50 | DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" |
51 | 51 | ||
52 | SRCREV = "2102196073a045d354e1ff5ea0e00ee4923b948d" | 52 | SRCREV = "88c57c1ad8b3a388de3359fc152e4354a09f8c0f" |
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 09150909..294a4e7d 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature | |||
37 | 37 | ||
38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" | 38 | EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" |
39 | 39 | ||
40 | SRCREV = "4934b87156a889584a34e36c22abd9aee64cef7e" | 40 | SRCREV = "29dbb9acede3f5d9e477fdedd53d04be4136c0de" |
41 | 41 | ||
42 | # From https://bugreports.qt.io/browse/QTBUG-57767 | 42 | # From https://bugreports.qt.io/browse/QTBUG-57767 |
43 | SRC_URI += " \ | 43 | SRC_URI += " \ |
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 60f48d99..64352ec3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -113,8 +113,8 @@ SRC_URI += " \ | |||
113 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ | 113 | file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ |
114 | " | 114 | " |
115 | 115 | ||
116 | SRCREV_qtwebengine = "1906d4df2146319dcdd5ef71ee26aa0a8ff6fb61" | 116 | SRCREV_qtwebengine = "55a5420173b6ab10611eb91386b54217b8218ba0" |
117 | SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" | 117 | SRCREV_chromium = "cf200aa240206da0bb30a3601192c45c3b8b2e94" |
118 | SRCREV = "${SRCREV_qtwebengine}" | 118 | SRCREV = "${SRCREV_qtwebengine}" |
119 | 119 | ||
120 | SRCREV_FORMAT = "qtwebengine_chromium" | 120 | SRCREV_FORMAT = "qtwebengine_chromium" |
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 86460595..db1bdc57 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -85,4 +85,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db | |||
85 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" | 85 | RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" |
86 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" | 86 | export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" |
87 | 87 | ||
88 | SRCREV = "821eaaadc9d63d03aca65cf757230b520daaaa7c" | 88 | SRCREV = "bf172ae289a1348842005a9421797970f9b72060" |
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index cdf465d6..c0e100fc 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb | |||
@@ -13,4 +13,4 @@ SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" | |||
13 | 13 | ||
14 | DEPENDS += "qtbase qtwebengine" | 14 | DEPENDS += "qtbase qtwebengine" |
15 | 15 | ||
16 | SRCREV = "22e7f1941fbbb7aa7212faabf5939b6d2ca7bd49" | 16 | SRCREV = "c795aad0aa9ff62da8d48dfa4b4c92bd55a18e45" |
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 552549d0..efe5fec2 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb | |||
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \ | |||
16 | 16 | ||
17 | DEPENDS += "qtbase" | 17 | DEPENDS += "qtbase" |
18 | 18 | ||
19 | SRCREV = "7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe" | 19 | SRCREV = "55bf61b68b42a79548bf1bf1358981d40cf75911" |
20 | 20 | ||
21 | BBCLASSEXTEND =+ "native nativesdk" | 21 | BBCLASSEXTEND =+ "native nativesdk" |